1672. [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 1dd2635cf900db8e5ae21e436dc571c912758d6d..1cf842776f4cd86e4cd867cf74858f0b60135f94 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+1672.  [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.
 
 1669.  [bug]           Restore "update forwarding denied" log messages

diff --git a/bin/tests/tasks/t_tasks.c b/bin/tests/tasks/t_tasks.c
index 44c90047757d6d413bfd70c0fe8f467e3759293f..61c735ae091c4c1b2b7e187595dc55c47e058db5 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.29.2.1 2004/03/09 06:10:30 marka Exp $ */
+/* $Id: t_tasks.c,v 1.29.2.2 2004/06/21 07:08:35 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 9c43716c77caa8d06c1258673a269d2734c3d6b7..4ab7f976da201a574cdb2d7f3ccdc30ffaa7834d 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.22.2.1 2004/03/09 06:10:31 marka Exp $ */
+/* $Id: t_timers.c,v 1.22.2.2 2004/06/21 07:08:36 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 188141594c46a77991db4c28a42c268d9e6543e5..4ac77739e621916a3a35405c7f1f771fc036e651 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.14.2.1 2004/03/09 06:12:45 marka Exp $ */
+/* $Id: t_api.h,v 1.14.2.2 2004/06/21 07:08:36 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 d23993a8300e77f5fd27eb7b657f1e8babed6456..c56b66a9fc199532c35602130901715739872fef 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.48.2.3 2004/03/09 06:12:44 marka Exp $ */
+/* $Id: t_api.c,v 1.48.2.4 2004/06/21 07:08:36 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;