diff options
Diffstat (limited to '')
| -rw-r--r-- | auto/make | 27 |
1 files changed, 11 insertions, 16 deletions
@@ -45,7 +45,7 @@ $echo >> $NXT_MAKEFILE $echo "NXT_LIB_DEPS = \\" >> $NXT_MAKEFILE -for nxt_dep in $NXT_LIB_DEPS $NXT_LIB_UNIT_TEST_DEPS $NXT_AUTO_CONFIG_H +for nxt_dep in $NXT_LIB_DEPS $NXT_TEST_DEPS $NXT_AUTO_CONFIG_H do $echo " $nxt_dep \\" >> $NXT_MAKEFILE done @@ -87,7 +87,7 @@ END # Object files. -for nxt_src in $NXT_LIB_SRCS $NXT_LIB_UNIT_TEST_SRCS +for nxt_src in $NXT_LIB_SRCS $NXT_TEST_SRCS do nxt_obj=`$echo $nxt_src | sed -e "s/\.c$/\.o/"` cat << END >> $NXT_MAKEFILE @@ -103,25 +103,25 @@ done $echo >> $NXT_MAKEFILE -# Unit test object files list. +# Test object files list. -$echo "NXT_LIB_UNIT_TEST_OBJS = \\" >> $NXT_MAKEFILE +$echo "NXT_TEST_OBJS = \\" >> $NXT_MAKEFILE -for nxt_src in $NXT_LIB_UNIT_TEST_SRCS +for nxt_src in $NXT_TEST_SRCS do nxt_obj=`$echo $nxt_src | sed -e "s/\.c$/\.o/"` $echo " $NXT_BUILD_DIR/$nxt_obj \\" >> $NXT_MAKEFILE done -# Unit test and utf8 test executables. +# Test executables. cat << END >> $NXT_MAKEFILE -$NXT_BUILD_DIR/lib_unit_test: \$(NXT_LIB_UNIT_TEST_OBJS) \\ +$NXT_BUILD_DIR/tests: \$(NXT_TEST_OBJS) \\ $NXT_BUILD_DIR/$NXT_LIB_STATIC \$(NXT_LIB_DEPS) - \$(NXT_EXEC_LINK) -o $NXT_BUILD_DIR/lib_unit_test \\ - \$(CFLAGS) \$(NXT_LIB_UNIT_TEST_OBJS) \\ + \$(NXT_EXEC_LINK) -o $NXT_BUILD_DIR/tests \\ + \$(CFLAGS) \$(NXT_TEST_OBJS) \\ $NXT_BUILD_DIR/$NXT_LIB_STATIC \\ $NXT_LD_OPT $NXT_LIBM $NXT_LIBS $NXT_LIB_AUX_LIBS @@ -136,11 +136,6 @@ $NXT_BUILD_DIR/utf8_file_name_test: $NXT_LIB_UTF8_FILE_NAME_TEST_SRCS \\ END -if [ $NXT_LIB_UNIT_TEST = YES ]; then - NXT_UNIT_TEST_TARGETS="$NXT_UNIT_TEST_TARGETS lib_test" -fi - - NXT_MAKE_INCS="src $NXT_BUILD_DIR" NXT_MAKE_DEPS="\$(NXT_LIB_DEPS) $NXT_DEPS" NXT_MAKE_SRCS="$NXT_SRCS" @@ -222,8 +217,8 @@ cat << END > Makefile include $NXT_MAKEFILE -.PHONY: lib_test -lib_test: $NXT_BUILD_DIR/lib_unit_test $NXT_BUILD_DIR/utf8_file_name_test +.PHONY: tests +tests: $NXT_BUILD_DIR/tests $NXT_BUILD_DIR/utf8_file_name_test clean: rm -rf $NXT_BUILD_DIR *.dSYM Makefile |