1671. [cleanup] Tests which only function in a threaded build

                        now return R:THREADONLY (rather than R:UNTESTED)
                        in a non-threaded build.

diff --git a/CHANGES b/CHANGES
index 358ffd17afd6c6fd9621febac7b6a1948ef03ed4..b485802f950b82efc86649908b423efb20a6a40c 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,8 @@
-1671.  [contrib]       queryperf: add NAPTR to the list on known types.
+1671.  [cleanup]       Tests which only function in a threaded build
+                       now return R:THREADONLY (rather than R:UNTESTED)
+                       in a non-threaded build.
+
+1671.  [contrib]       queryperf: add NAPTR to the list of known types.
 
 1670.  [func]          Log UPDATE requests to slave zones without an acl as
                        "disabled" at debug level 3. [RT# 11657]

diff --git a/bin/tests/tasks/t_tasks.c b/bin/tests/tasks/t_tasks.c
index 7d037bc4f4579950b85219472e44ac029cd140bd..b16cd69b39ba12e60ad9fae18c41f6c872161c0c 100644 (file)
--- a/bin/tests/tasks/t_tasks.c
+++ b/bin/tests/tasks/t_tasks.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: t_tasks.c,v 1.32 2004/03/05 05:04:10 marka Exp $ */
+/* $Id: t_tasks.c,v 1.33 2004/06/21 05:36:41 marka Exp $ */
 
 #include <config.h>
 
@@ -41,7 +41,7 @@ isc_boolean_t threaded = ISC_FALSE;
 static void
 require_threads(void) {
        t_info("This test requires threads\n");
-       t_result(T_UNTESTED);
+       t_result(T_THREADONLY);
        return;
 }
 

diff --git a/bin/tests/timers/t_timers.c b/bin/tests/timers/t_timers.c
index a9c9b38c025ded0bd93cb984db8479db0632c457..260f1ff4ec18dcc2a6e0bc447c3c6253e82192e1 100644 (file)
--- a/bin/tests/timers/t_timers.c
+++ b/bin/tests/timers/t_timers.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: t_timers.c,v 1.23 2004/03/05 05:04:12 marka Exp $ */
+/* $Id: t_timers.c,v 1.24 2004/06/21 05:36:41 marka Exp $ */
 
 #include <config.h>
 
@@ -55,7 +55,7 @@ static        int             Tx_nanoseconds;
 static void
 require_threads(void) {
        t_info("This test requires threads\n");
-       t_result(T_UNTESTED);
+       t_result(T_THREADONLY);
        return;
 }
 

diff --git a/lib/tests/include/tests/t_api.h b/lib/tests/include/tests/t_api.h
index 97fa102a3b3738a4b894391daaa31c450d578576..288bf1c020e045cc2f4a88a850050d4f41beae72 100644 (file)
--- a/lib/tests/include/tests/t_api.h
+++ b/lib/tests/include/tests/t_api.h
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: t_api.h,v 1.15 2004/03/05 05:13:59 marka Exp $ */
+/* $Id: t_api.h,v 1.16 2004/06/21 05:36:40 marka Exp $ */
 
 #ifndef TESTS_T_API_H
 #define TESTS_T_API_H 1
@@ -37,6 +37,7 @@
 #define        T_UNRESOLVED    0x3
 #define        T_UNSUPPORTED   0x4
 #define        T_UNTESTED      0x5
+#define        T_THREADONLY    0x6
 
 /*
  *

diff --git a/lib/tests/t_api.c b/lib/tests/t_api.c
index 31c9f24c8be5621d277f5e7a81de3be60dde2679..0277e5ac85dbde182f730fb40434ddd498ca1f54 100644 (file)
--- a/lib/tests/t_api.c
+++ b/lib/tests/t_api.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: t_api.c,v 1.52 2004/03/05 05:13:39 marka Exp $ */
+/* $Id: t_api.c,v 1.53 2004/06/21 05:36:40 marka Exp $ */
 
 #include <config.h>
 
@@ -390,6 +390,9 @@ t_result(int result) {
                case T_UNTESTED:
                        p = "UNTESTED";
                        break;
+               case T_THREADONLY:
+                       p = "THREADONLY";
+                       break;
                default:
                        p = "UNKNOWN";
                        break;