Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/usr.bin/make/unit-tests Avoid \a as a test of invalid separa...



details:   https://anonhg.NetBSD.org/src/rev/e8901a8cae76
branches:  trunk
changeset: 550195:e8901a8cae76
user:      sjg <sjg%NetBSD.org@localhost>
date:      Fri Aug 01 04:57:20 2003 +0000

description:
Avoid \a as a test of invalid separator, since if we make ksh the default
shell, we get different results.  \x seems safe.

diffstat:

 usr.bin/make/unit-tests/Makefile |  6 +++---
 usr.bin/make/unit-tests/test.exp |  4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diffs (41 lines):

diff -r 39c727c96053 -r e8901a8cae76 usr.bin/make/unit-tests/Makefile
--- a/usr.bin/make/unit-tests/Makefile  Fri Aug 01 03:55:59 2003 +0000
+++ b/usr.bin/make/unit-tests/Makefile  Fri Aug 01 04:57:20 2003 +0000
@@ -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 @@
        @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 @@
 # 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 -r 39c727c96053 -r e8901a8cae76 usr.bin/make/unit-tests/test.exp
--- a/usr.bin/make/unit-tests/test.exp  Fri Aug 01 03:55:59 2003 +0000
+++ b/usr.bin/make/unit-tests/test.exp  Fri Aug 01 04:57:20 2003 +0000
@@ -23,8 +23,8 @@
 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>



Home | Main Index | Thread Index | Old Index