summaryrefslogtreecommitdiff
path: root/usr.bin/make/unit-tests
diff options
context:
space:
mode:
authorsjg <sjg@NetBSD.org>2003-08-01 04:57:20 +0000
committersjg <sjg@NetBSD.org>2003-08-01 04:57:20 +0000
commit3dfdacc17009ad1ca63a03131bcaefbfb587949a (patch)
treef9a32e1f5253ac292325ccc218e131dce217f839 /usr.bin/make/unit-tests
parent86b9a219d42838044d6f0da4b7d3a9e4f89eab01 (diff)
Avoid \a as a test of invalid separator, since if we make ksh the default
shell, we get different results. \x seems safe.
Diffstat (limited to 'usr.bin/make/unit-tests')
-rw-r--r--usr.bin/make/unit-tests/Makefile6
-rw-r--r--usr.bin/make/unit-tests/test.exp4
2 files changed, 5 insertions, 5 deletions
diff --git a/usr.bin/make/unit-tests/Makefile b/usr.bin/make/unit-tests/Makefile
index f5a7835c720..5242f1e2c73 100644
--- a/usr.bin/make/unit-tests/Makefile
+++ b/usr.bin/make/unit-tests/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.5 2003/07/31 00:46:15 sjg Exp $
+# $Id: Makefile,v 1.6 2003/08/01 04:57:20 sjg Exp $
#
# Unit tests for make(1)
# The main targets are:
@@ -36,7 +36,7 @@ mod-ts:
@echo 'LIST:ts/t="${LIST:ts\t}"'
@echo 'LIST:ts/012:tu="${LIST:ts\012:tu}"'
@echo 'LIST:tx="${LIST:tx}"'
- @echo 'LIST:ts/a:tu="${LIST:ts\a:tu}"'
+ @echo 'LIST:ts/x:tu="${LIST:ts\x:tu}"'
@echo 'FU_$@="${FU_${@:ts}:ts}"'
@echo 'FU_$@:ts:T="${FU_${@:ts}:ts:T}" == cool?'
@@ -54,7 +54,7 @@ TEST_MAKE?= ${MAKE}
# here is the driver
test:
@echo "${TEST_MAKE} -f ${MAKEFILE} > ${.TARGET}.out 2>&1"
- @cd ${.OBJDIR}; ${TEST_MAKE} -f ${MAKEFILE} 2>&1 | \
+ @cd ${.OBJDIR} && ${TEST_MAKE} -f ${MAKEFILE} 2>&1 | \
sed 's,^${TEST_MAKE:T}:,make:,' > ${.TARGET}.out || { \
tail ${.TARGET}.out; mv ${.TARGET}.out ${.TARGET}.fail; exit 1; }
diff -u ${.CURDIR}/${.TARGET}.exp ${.TARGET}.out
diff --git a/usr.bin/make/unit-tests/test.exp b/usr.bin/make/unit-tests/test.exp
index 0bd40b141e8..7906eb1b59c 100644
--- a/usr.bin/make/unit-tests/test.exp
+++ b/usr.bin/make/unit-tests/test.exp
@@ -23,8 +23,8 @@ FIVE
SIX"
make: Bad modifier `:tx' for LIST
LIST:tx="}"
-make: Bad modifier `:ts\a' for LIST
-LIST:ts/a:tu="\a:tu}"
+make: Bad modifier `:ts\x' for LIST
+LIST:ts/x:tu="\x:tu}"
FU_mod-ts="a/b/cool"
FU_mod-ts:ts:T="cool" == cool?
default FU=<v>fu</v> FOO=<v>foo</v> VAR=<v></v>