]> git.kaiwu.me - njs.git/commitdiff
Unifying makefile target names.
authorDmitry Volyntsev <xeioex@nginx.com>
Mon, 15 Jul 2019 16:20:55 +0000 (19:20 +0300)
committerDmitry Volyntsev <xeioex@nginx.com>
Mon, 15 Jul 2019 16:20:55 +0000 (19:20 +0300)
auto/expect
auto/make

index 134e48d273b347a9d79ae805d6524b6907d2632e..bbb898b18d9ac188e397eb9b65d8a68c5840c593 100644 (file)
@@ -20,7 +20,7 @@ fi
 if [ $nxt_found = yes -a $NXT_HAVE_READLINE = YES ]; then
     cat << END >> $NXT_MAKEFILE
 
-njs_expect_test:       njs njs/test/njs_expect_test.exp
+expect_test:   njs njs/test/njs_expect_test.exp
        INPUTRC=njs/test/inputrc PATH=$NXT_BUILD_DIR:\$(PATH) \
             expect -f njs/test/njs_expect_test.exp
 END
@@ -30,7 +30,7 @@ else
 
     cat << END >> $NXT_MAKEFILE
 
-njs_expect_test:
+expect_test:
        @echo "Skipping expect tests"
 END
 
index 03046ac69e9c52d699b71b8e00a9e0f53253fd75..b398a9ef48cd964317f6ea8203c659a5a74b5528 100644 (file)
--- a/auto/make
+++ b/auto/make
@@ -244,7 +244,7 @@ unit_test: $NXT_BUILD_DIR/nxt_auto_config.h \\
        $NXT_BUILD_DIR/njs_unit_test
        $NXT_BUILD_DIR/njs_interactive_test
 
-test: njs_expect_test unit_test
+test: expect_test unit_test
 
 benchmark: $NXT_BUILD_DIR/nxt_auto_config.h \\
        $NXT_BUILD_DIR/njs_benchmark