technocloud-public/nginx-unit
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Returning error for "make tests" when "--tests" wasn't configured.

Browse Source
This commit is contained in:
Valentin Bartenev
2018-08-08 18:43:46 +03:00
parent 6c0c3dcaa7
commit 941616f893
1 changed files with 29 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
auto/make
View File

@@ -116,6 +116,8 @@ done
$echo >> $NXT_MAKEFILE $echo >> $NXT_MAKEFILE
if [ $NXT_TESTS = YES ]; then
# Test object files list. # Test object files list.
$echo "NXT_TEST_OBJS = \\" >> $NXT_MAKEFILE $echo "NXT_TEST_OBJS = \\" >> $NXT_MAKEFILE
@@ -126,11 +128,14 @@ do
$echo " $NXT_BUILD_DIR/$nxt_obj \\" >> $NXT_MAKEFILE $echo " $NXT_BUILD_DIR/$nxt_obj \\" >> $NXT_MAKEFILE
done done
# Test executables. # Test executables.
cat << END >> $NXT_MAKEFILE cat << END >> $NXT_MAKEFILE
.PHONY: tests
tests: $NXT_BUILD_DIR/tests $NXT_BUILD_DIR/utf8_file_name_test \\
$NXT_BUILD_DIR/unit_app_test
$NXT_BUILD_DIR/tests: \$(NXT_TEST_OBJS) \\ $NXT_BUILD_DIR/tests: \$(NXT_TEST_OBJS) \\
$NXT_BUILD_DIR/$NXT_LIB_STATIC $NXT_BUILD_DIR/$NXT_LIB_STATIC
\$(NXT_EXEC_LINK) -o $NXT_BUILD_DIR/tests \\ \$(NXT_EXEC_LINK) -o $NXT_BUILD_DIR/tests \\
@@ -155,6 +160,21 @@ $NXT_BUILD_DIR/unit_app_test: $NXT_BUILD_DIR/src/test/nxt_unit_app_test.o \\
END END
else
cat << END >> $NXT_MAKEFILE
.PHONY: tests
tests:
@(echo; \\
echo "error: to make tests you need to configure --tests option."; \\
echo; \\
exit 1)
END
fi
NXT_MAKE_INCS="src $NXT_BUILD_DIR" NXT_MAKE_INCS="src $NXT_BUILD_DIR"
NXT_MAKE_SRCS="$NXT_SRCS" NXT_MAKE_SRCS="$NXT_SRCS"
@@ -264,10 +284,6 @@ cat << END > Makefile
include $NXT_MAKEFILE include $NXT_MAKEFILE
.PHONY: tests
tests: $NXT_BUILD_DIR/tests $NXT_BUILD_DIR/utf8_file_name_test \\
$NXT_BUILD_DIR/unit_app_test
.PHONY: clean .PHONY: clean
clean: clean:
rm -rf $NXT_BUILD_DIR *.dSYM Makefile rm -rf $NXT_BUILD_DIR *.dSYM Makefile