diff options
author | harti <harti@FreeBSD.org> | 2004-12-07 14:41:16 +0000 |
---|---|---|
committer | harti <harti@FreeBSD.org> | 2004-12-07 14:41:16 +0000 |
commit | c90efa2b2fb0e64d38ea630ac7216f3509ec03a7 (patch) | |
tree | 6f732dd7aed468e9363a713a5146599cea1e577b /tools | |
parent | 849729c60bb4e75b1807c2774e9c57a50004db95 (diff) | |
download | FreeBSD-src-c90efa2b2fb0e64d38ea630ac7216f3509ec03a7.zip FreeBSD-src-c90efa2b2fb0e64d38ea630ac7216f3509ec03a7.tar.gz |
Fix builds with a read-only directory and a make upgrade. This is done
by forcing the creation of an object directory for the make regression
tests. Let make handle the tracking of the dependency and installation
of test_shell script.
Submitted by: ru
Diffstat (limited to 'tools')
-rw-r--r-- | tools/build/make_check/Makefile | 10 | ||||
-rw-r--r-- | tools/regression/usr.bin/make/Makefile | 10 |
2 files changed, 8 insertions, 12 deletions
diff --git a/tools/build/make_check/Makefile b/tools/build/make_check/Makefile index 777dd7f..4c2389a 100644 --- a/tools/build/make_check/Makefile +++ b/tools/build/make_check/Makefile @@ -21,9 +21,6 @@ NIL= SMAKE= MAKEFLAGS= ${MAKE} -C ${.CURDIR} all: - @if [ ! -x ./shell_test ] ; then \ - ${INSTALL} -m 555 ${.CURDIR}/shell_test.sh shell_test ; \ - fi @echo '1..17' @${SMAKE} C_check || { cd ${.CURDIR} ; ${MAKE} failure ; } @echo "ok 1 - C_check # Test of -C flag existence detected no regression." @@ -271,7 +268,7 @@ shell_1_sh: .if make(shell_2) # Test if we can replace the shell specification. We do this by using # a shell scripts that prints us its arguments and standard input as the shell -shell_2: +shell_2: shell_test @${SMAKE} -B shell_2B | \ diff -u ${.CURDIR}/regress.shell_2B.out - || false @${SMAKE} -j1 shell_2j | \ @@ -298,5 +295,6 @@ failure: @echo "not ok # Test failed: regression detected. See above." @false -clean: - rm -f shell_test +CLEANFILES= shell_test + +.include <bsd.obj.mk> diff --git a/tools/regression/usr.bin/make/Makefile b/tools/regression/usr.bin/make/Makefile index 777dd7f..4c2389a 100644 --- a/tools/regression/usr.bin/make/Makefile +++ b/tools/regression/usr.bin/make/Makefile @@ -21,9 +21,6 @@ NIL= SMAKE= MAKEFLAGS= ${MAKE} -C ${.CURDIR} all: - @if [ ! -x ./shell_test ] ; then \ - ${INSTALL} -m 555 ${.CURDIR}/shell_test.sh shell_test ; \ - fi @echo '1..17' @${SMAKE} C_check || { cd ${.CURDIR} ; ${MAKE} failure ; } @echo "ok 1 - C_check # Test of -C flag existence detected no regression." @@ -271,7 +268,7 @@ shell_1_sh: .if make(shell_2) # Test if we can replace the shell specification. We do this by using # a shell scripts that prints us its arguments and standard input as the shell -shell_2: +shell_2: shell_test @${SMAKE} -B shell_2B | \ diff -u ${.CURDIR}/regress.shell_2B.out - || false @${SMAKE} -j1 shell_2j | \ @@ -298,5 +295,6 @@ failure: @echo "not ok # Test failed: regression detected. See above." @false -clean: - rm -f shell_test +CLEANFILES= shell_test + +.include <bsd.obj.mk> |