d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix builds with a read-only directory and a make upgrade. This is done

Browse Source 
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
This commit is contained in:
harti 2004-12-07 14:41:16 +00:00
parent 9abda6f140
commit 427e20da2c
3 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@ -217,6 +217,7 @@ kernel: buildkernel installkernel
#
upgrade_checks:
@if ! (cd ${.CURDIR}/tools/regression/usr.bin/make && \
PATH=${PATH} ${BINMAKE} obj >/dev/null 2>&1 && \
PATH=${PATH} ${BINMAKE} >/dev/null 2>&1); \
then \
(cd ${.CURDIR} && make make); \

10
tools/build/make_check/Makefile
View File

@ -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>

10
tools/regression/usr.bin/make/Makefile
View File

@ -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>