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 22958dac992cbeb784fa4b825a404b6349c8c0c7..5ae19e98cb50cf07b79783bbc1864e8ba02e14bf 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.
 
 1670.  [func]          Log UPDATE requests to slave zones without an acl as

diff --git a/bin/tests/tasks/t_tasks.c b/bin/tests/tasks/t_tasks.c
index 00de5ceee82a21d290c290b9de3758cdad0fb380..5676006f58b636182c80062d0c3226257c8f44f5 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.12.4 2004/03/08 09:04:20 marka Exp $ */
+/* $Id: t_tasks.c,v 1.29.12.5 2004/06/21 06:57:59 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 85b83be5eac5ce8601830071ddfa76c99c72a6b8..665c4a3938235fd942d0f0acd097163df6df4d9d 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.206.1 2004/03/06 10:22:52 marka Exp $ */
+/* $Id: t_timers.c,v 1.22.206.2 2004/06/21 06:57:59 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 6836db9d3109bc765229150f1583ec833cb773b8..7ff88ef85c069ffd38efac0909c8d7846f5d8cb8 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.206.1 2004/03/06 08:15:47 marka Exp $ */
+/* $Id: t_api.h,v 1.14.206.2 2004/06/21 06:58:02 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 464b7f75b579fa0736adcd2f70bd70e970eebd60..5d74e85b5a4d0898e0636f87c8357e5983b116d1 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.1.2.4 2004/03/08 09:05:13 marka Exp $ */
+/* $Id: t_api.c,v 1.48.2.1.2.5 2004/06/21 06:58:02 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;