1 files changed, 27 insertions, 26 deletions

diff --git a/test/nxt_lib_unit_test.c b/test/nxt_tests.c
index bac2258e..655192ab 100644
--- a/test/nxt_lib_unit_test.c
+++ b/test/nxt_tests.c
@@ -5,6 +5,7 @@
  */
 
 #include <nxt_main.h>
+#include "nxt_tests.h"
 
 
 extern char  **environ;
@@ -27,7 +28,7 @@ main(int argc, char **argv)
     nxt_task_t    task;
     nxt_thread_t  *thr;
 
-    if (nxt_lib_start("lib_unit_test", argv, &environ) != NXT_OK) {
+    if (nxt_lib_start("tests", argv, &environ) != NXT_OK) {
         return 1;
     }
 
@@ -37,7 +38,7 @@ main(int argc, char **argv)
     thr = nxt_thread();
     thr->task = &task;
 
-#if (NXT_UNIT_TEST_RTDTSC)
+#if (NXT_TEST_RTDTSC)
 
     if (nxt_process_argv[1] != NULL
         && nxt_memcmp(nxt_process_argv[1], "rbm", 3) == 0)
@@ -50,14 +51,14 @@ main(int argc, char **argv)
             return 1;
         }
 
-        if (nxt_lvlhsh_unit_test(thr, 500 * 1000, 0) != NXT_OK) {
+        if (nxt_lvlhsh_test(thr, 500 * 1000, 0) != NXT_OK) {
             return 1;
         }
 
         nxt_rbtree1_mb_insert(thr);
         nxt_rbtree_mb_insert(thr);
 
-        if (nxt_lvlhsh_unit_test(thr, 500 * 1000, 0) != NXT_OK) {
+        if (nxt_lvlhsh_test(thr, 500 * 1000, 0) != NXT_OK) {
             return 1;
         }
 
@@ -69,91 +70,91 @@ main(int argc, char **argv)
 
 #endif
 
-    if (nxt_random_unit_test(thr) != NXT_OK) {
+    if (nxt_random_test(thr) != NXT_OK) {
         return 1;
     }
 
-    if (nxt_term_parse_unit_test(thr) != NXT_OK) {
+    if (nxt_term_parse_test(thr) != NXT_OK) {
         return 1;
     }
 
-    if (nxt_msec_diff_unit_test(thr, nxt_msec_less) != NXT_OK) {
+    if (nxt_msec_diff_test(thr, nxt_msec_less) != NXT_OK) {
         return 1;
     }
 
-    if (nxt_rbtree_unit_test(thr, 100 * 1000) != NXT_OK) {
+    if (nxt_rbtree_test(thr, 100 * 1000) != NXT_OK) {
         return 1;
     }
 
-    if (nxt_rbtree_unit_test(thr, 1000 * 1000) != NXT_OK) {
+    if (nxt_rbtree_test(thr, 1000 * 1000) != NXT_OK) {
         return 1;
     }
 
-    if (nxt_rbtree1_unit_test(thr, 100 * 1000) != NXT_OK) {
+    if (nxt_rbtree1_test(thr, 100 * 1000) != NXT_OK) {
         return 1;
     }
 
-    if (nxt_rbtree1_unit_test(thr, 1000 * 1000) != NXT_OK) {
+    if (nxt_rbtree1_test(thr, 1000 * 1000) != NXT_OK) {
         return 1;
     }
 
-    if (nxt_mp_unit_test(thr, 100, 40000, 128 - 1) != NXT_OK) {
+    if (nxt_mp_test(thr, 100, 40000, 128 - 1) != NXT_OK) {
         return 1;
     }
 
-    if (nxt_mp_unit_test(thr, 100, 1000, 4096 - 1) != NXT_OK) {
+    if (nxt_mp_test(thr, 100, 1000, 4096 - 1) != NXT_OK) {
         return 1;
     }
 
-    if (nxt_mp_unit_test(thr, 1000, 100, 64 * 1024 - 1) != NXT_OK) {
+    if (nxt_mp_test(thr, 1000, 100, 64 * 1024 - 1) != NXT_OK) {
         return 1;
     }
 
-    if (nxt_mem_zone_unit_test(thr, 100, 20000, 128 - 1) != NXT_OK) {
+    if (nxt_mem_zone_test(thr, 100, 20000, 128 - 1) != NXT_OK) {
         return 1;
     }
 
-    if (nxt_mem_zone_unit_test(thr, 100, 10000, 4096 - 1) != NXT_OK) {
+    if (nxt_mem_zone_test(thr, 100, 10000, 4096 - 1) != NXT_OK) {
         return 1;
     }
 
-    if (nxt_mem_zone_unit_test(thr, 1000, 40, 64 * 1024 - 1) != NXT_OK) {
+    if (nxt_mem_zone_test(thr, 1000, 40, 64 * 1024 - 1) != NXT_OK) {
         return 1;
     }
 
-    if (nxt_lvlhsh_unit_test(thr, 2, 1) != NXT_OK) {
+    if (nxt_lvlhsh_test(thr, 2, 1) != NXT_OK) {
         return 1;
     }
 
-    if (nxt_lvlhsh_unit_test(thr, 100 * 1000, 1) != NXT_OK) {
+    if (nxt_lvlhsh_test(thr, 100 * 1000, 1) != NXT_OK) {
         return 1;
     }
 
-    if (nxt_lvlhsh_unit_test(thr, 100 * 1000, 0) != NXT_OK) {
+    if (nxt_lvlhsh_test(thr, 100 * 1000, 0) != NXT_OK) {
         return 1;
     }
 
-    if (nxt_lvlhsh_unit_test(thr, 1000 * 1000, 1) != NXT_OK) {
+    if (nxt_lvlhsh_test(thr, 1000 * 1000, 1) != NXT_OK) {
         return 1;
     }
 
-    if (nxt_gmtime_unit_test(thr) != NXT_OK) {
+    if (nxt_gmtime_test(thr) != NXT_OK) {
         return 1;
     }
 
-    if (nxt_sprintf_unit_test(thr) != NXT_OK) {
+    if (nxt_sprintf_test(thr) != NXT_OK) {
         return 1;
     }
 
-    if (nxt_malloc_unit_test(thr) != NXT_OK) {
+    if (nxt_malloc_test(thr) != NXT_OK) {
         return 1;
     }
 
-    if (nxt_utf8_unit_test(thr) != NXT_OK) {
+    if (nxt_utf8_test(thr) != NXT_OK) {
         return 1;
     }
 
-    if (nxt_http_parse_unit_test(thr) != NXT_OK) {
+    if (nxt_http_parse_test(thr) != NXT_OK) {
         return 1;
     }