commit 5b69547863e7e3da563e26164c34f22585920377 parent 6d67d778d8a2bfe2093233d1fae81663f712aa2a Author: Roberto E. Vargas Caballero <k0ga@shike2.net> Date: Sat, 3 Jan 2026 15:24:55 +0100 tests: Use $TEST in every scc invocation using a variable before executing any of the commands allows to use emulators of checkers easilly just setting that variable. Diffstat:
128 files changed, 166 insertions(+), 148 deletions(-)
diff --git a/tests/as/execute/test.sh b/tests/as/execute/test.sh @@ -11,7 +11,7 @@ file=$cpu.s trap "rm -f a.out $tmp1 $tmp2" 0 2 3 -scc as -m $cpu $file +$EXEC scc as -m $cpu $file sed -n '/^\#/ ! { /\#/ ! d @@ -26,7 +26,7 @@ sed -n '/^\#/ ! { nl -b a > $tmp1 -scc dump | +$EXEC scc dump | sed -n '/^data:/,$ { /^data:/ ! { s%.*:%% diff --git a/tests/cc/error/Makefile b/tests/cc/error/Makefile @@ -2,10 +2,10 @@ ROOT=../../.. SCCPREFIX=$(ROOT) -CC=$(ROOT)/bin/scc +CC=$(EXEC) $(ROOT)/bin/scc cc all: - @CC=$(CC) ./chktest.sh scc-tests.lst + @CC='$(CC)' ./chktest.sh scc-tests.lst tests: @$(MAKE) |\ diff --git a/tests/cc/execute/Makefile b/tests/cc/execute/Makefile @@ -1,11 +1,10 @@ .POSIX: ROOT=../../.. -SCCPREFIX=$(ROOT) -CC=$(ROOT)/bin/scc +CC=$(SHELL) $(ROOT)/bin/scc cc all: - @CC=$(CC) ./chktest.sh scc-tests.lst + @CC='$(CC)' ./chktest.sh scc-tests.lst tests: @$(MAKE) |\ diff --git a/tests/ld/execute/Makefile b/tests/ld/execute/Makefile @@ -26,13 +26,13 @@ tests: printf '\tld/execute\n' a.out: $(OBJS) f.a - scc ld $(OBJS) f.a >/dev/null 2>&1 || true + $(EXEC) scc ld $(OBJS) f.a >/dev/null 2>&1 || true f.a: $(OBJLIB) - scc ar -rv $@ $? >/dev/null 2>&1 + $(EXEC) scc ar -rv $@ $? >/dev/null 2>&1 size: - scc size *.o *.a + $(EXEC) scc size *.o *.a clean: rm -f *.o *.a a.out core* *.dat diff --git a/tests/make/error/0001-macro.sh b/tests/make/error/0001-macro.sh @@ -5,7 +5,7 @@ trap 'exit 1' INT TERM HUP tmp1=tmp1.$$ -scc make -f - <<'EOF' > $tmp1 2>&1 +$EXEC scc make -f - <<'EOF' > $tmp1 2>&1 FLAGS=Hello $(EFLAGS) all: $(DIRS) @echo Hello World diff --git a/tests/make/execute/0001-rule.sh b/tests/make/execute/0001-rule.sh @@ -5,7 +5,7 @@ trap 'exit 1' HUP INT TERM tmp1=tmp1.$$ -scc make hello > $tmp1 2>&1 +$EXEC scc make hello > $tmp1 2>&1 diff $tmp1 - <<EOF Hello World! diff --git a/tests/make/execute/0002-fflag.sh b/tests/make/execute/0002-fflag.sh @@ -5,7 +5,7 @@ trap 'exit 1' HUP INT TERM tmp1=tmp1.$$ -scc make -f test.mk print-cc print-makeflags > $tmp1 2>&1 +$EXEC scc make -f test.mk print-cc print-makeflags > $tmp1 2>&1 diff $tmp1 - <<EOF c99 diff --git a/tests/make/execute/0003-fflag.sh b/tests/make/execute/0003-fflag.sh @@ -5,7 +5,7 @@ trap 'exit 1' HUP INT TERM tmp1=tmp1.$$ -scc make -ftest.mk print-cc print-makeflags > $tmp1 2>&1 +$EXEC scc make -ftest.mk print-cc print-makeflags > $tmp1 2>&1 diff $tmp1 - <<EOF c99 diff --git a/tests/make/execute/0004-fflag.sh b/tests/make/execute/0004-fflag.sh @@ -5,7 +5,8 @@ trap 'exit 1' HUP INT TERM tmp1=tmp1.$$ -MAKEFLAGS=-fff.mk scc make -f test.mk print-cc print-makeflags > $tmp1 2>&1 +MAKEFLAGS=-fff.mk \ +$EXEC scc make -f test.mk print-cc print-makeflags > $tmp1 2>&1 diff $tmp1 - <<EOF c99 diff --git a/tests/make/execute/0005-fflag.sh b/tests/make/execute/0005-fflag.sh @@ -5,7 +5,8 @@ trap 'exit 1' HUP INT TERM tmp1=tmp1.$$ -MAKEFLAGS=ffff.mk scc make -f test.mk print-cc print-makeflags > $tmp1 2>&1 +MAKEFLAGS=ffff.mk \ +$EXEC scc make -f test.mk print-cc print-makeflags > $tmp1 2>&1 diff $tmp1 - <<EOF c99 diff --git a/tests/make/execute/0006-iflag.sh b/tests/make/execute/0006-iflag.sh @@ -5,7 +5,7 @@ trap 'exit 1' HUP INT TERM tmp1=tmp1.$$ -scc make -if test.mk error print-makeflags 2>&1 | +$EXEC scc make -if test.mk error print-makeflags 2>&1 | sed 's/sh:.*: *no-/sh: no-/' > $tmp1 2>&1 diff $tmp1 - <<EOF diff --git a/tests/make/execute/0007-iflag.sh b/tests/make/execute/0007-iflag.sh @@ -5,7 +5,8 @@ trap 'exit 1' HUP INT TERM tmp1=tmp1.$$ -MAKEFLAGS=-i scc make -f test.mk error print-makeflags 2>&1 | +MAKEFLAGS=-i \ +$EXEC scc make -f test.mk error print-makeflags 2>&1 | sed 's/sh:.*: *no-/sh: no-/' > $tmp1 2>&1 diff $tmp1 - <<EOF diff --git a/tests/make/execute/0008-ignore.sh b/tests/make/execute/0008-ignore.sh @@ -5,7 +5,7 @@ trap 'exit 1' HUP INT TERM tmp1=tmp1.$$ -scc make -f test.mk ignored-error hello 2>&1 | +$EXEC scc make -f test.mk ignored-error hello 2>&1 | sed 's/sh:.*: *no-/sh: no-/' > $tmp1 2>&1 diff $tmp1 - <<EOF diff --git a/tests/make/execute/0009-ignore.sh b/tests/make/execute/0009-ignore.sh @@ -5,7 +5,7 @@ trap 'exit 1' HUP INT TERM tmp1=tmp1.$$ -(scc make -f - error hello 2>&1 | +($EXEC scc make -f - error hello 2>&1 | sed 's/sh:.*: *no-/sh: no-/' > $tmp1) <<EOF .IGNORE: diff --git a/tests/make/execute/0010-kflag.sh b/tests/make/execute/0010-kflag.sh @@ -6,7 +6,7 @@ trap 'exit 1' HUP INT TERM tmp1=tmp1.$$ (set -e - scc make -kf test.mk print-makeflags follow + $EXEC scc make -kf test.mk print-makeflags follow echo fail) 2>&1 | sed 's/:.*: *no-/: no-/' > $tmp1 diff --git a/tests/make/execute/0011-kflag.sh b/tests/make/execute/0011-kflag.sh @@ -6,7 +6,8 @@ trap 'exit 1' HUP INT TERM tmp1=tmp1.$$ (set -e - MAKEFLAGS=-k scc make -f test.mk print-makeflags follow + MAKEFLAGS=-k \ + $EXEC scc make -f test.mk print-makeflags follow echo fail) 2>&1 | sed 's/:.*: *no-/: no-/' > $tmp1 diff --git a/tests/make/execute/0012-nflag.sh b/tests/make/execute/0012-nflag.sh @@ -6,7 +6,7 @@ trap 'exit 1' HUP INT TERM tmp1=tmp1.$$ (set -e - scc make -f test.mk -n print-makeflags error + $EXEC scc make -f test.mk -n print-makeflags error echo correct) > $tmp1 2>&1 diff $tmp1 - <<EOF diff --git a/tests/make/execute/0013-nflag.sh b/tests/make/execute/0013-nflag.sh @@ -6,7 +6,8 @@ trap 'exit 1' HUP INT TERM tmp1=tmp1.$$ (set -e - MAKEFLAGS=-n scc make -f test.mk print-makeflags error + MAKEFLAGS=-n \ + $EXEC scc make -f test.mk print-makeflags error echo correct) > $tmp1 2>&1 diff $tmp1 - <<EOF diff --git a/tests/make/execute/0014-nflag.sh b/tests/make/execute/0014-nflag.sh @@ -5,7 +5,7 @@ trap 'exit 1' HUP INT TERM tmp1=tmp1.$$ -scc make -nf test.mk print-hidden-hello > $tmp1 2>&1 +$EXEC scc make -nf test.mk print-hidden-hello > $tmp1 2>&1 diff $tmp1 - <<EOF echo Hello World! diff --git a/tests/make/execute/0015-pflag.sh b/tests/make/execute/0015-pflag.sh @@ -7,7 +7,7 @@ tmp1=tmp1.$$ unset MAKEFLAGS -(scc make -pf - all | grep -v MAKE > $tmp1 2>&1) <<'EOF' +($EXEC scc make -pf - all | grep -v MAKE > $tmp1 2>&1) <<'EOF' all: @echo hello EOF diff --git a/tests/make/execute/0016-qflag.sh b/tests/make/execute/0016-qflag.sh @@ -6,7 +6,7 @@ trap 'exit 1' HUP INT TERM tmp1=tmp1.$$ (set -e - scc make -qf test.mk test.mk + $EXEC scc make -qf test.mk test.mk echo pass) > $tmp1 2>&1 diff $tmp1 - <<EOF diff --git a/tests/make/execute/0017-qflag.sh b/tests/make/execute/0017-qflag.sh @@ -6,7 +6,7 @@ trap 'exit 1' HUP INT TERM tmp1=tmp1.$$ (set -e - scc make -qf test.mk error + $EXEC scc make -qf test.mk error echo fail) > $tmp1 2>&1 diff $tmp1 - <<EOF diff --git a/tests/make/execute/0018-qflag.sh b/tests/make/execute/0018-qflag.sh @@ -6,7 +6,7 @@ trap 'exit 1' HUP INT TERM tmp1=tmp1.$$ (set -e - scc make -qf test.mk print-makeflags-always + $EXEC scc make -qf test.mk print-makeflags-always echo pass) > $tmp1 2>&1 diff $tmp1 - <<EOF diff --git a/tests/make/execute/0019-qflag.sh b/tests/make/execute/0019-qflag.sh @@ -6,7 +6,8 @@ trap 'exit 1' HUP INT TERM tmp1=tmp1.$$ (set -e - MAKEFLAGS=-q scc make -f test.mk print-makeflags-always + MAKEFLAGS=-q \ + $EXEC scc make -f test.mk print-makeflags-always echo pass) > $tmp1 2>&1 diff $tmp1 - <<EOF diff --git a/tests/make/execute/0020-rflag.sh b/tests/make/execute/0020-rflag.sh @@ -5,7 +5,7 @@ trap 'exit 1' HUP INT TERM tmp1=tmp1.$$ -scc make -rf test.mk file.o print-makeflags > $tmp1 2>&1 +$EXEC scc make -rf test.mk file.o print-makeflags > $tmp1 2>&1 diff $tmp1 - <<EOF -r diff --git a/tests/make/execute/0021-rflag.sh b/tests/make/execute/0021-rflag.sh @@ -6,7 +6,8 @@ trap 'exit 1' HUP INT TERM tmp1=tmp1.$$ touch file.c -MAKEFLAGS=-r scc make -f test.mk file.o print-makeflags > $tmp1 2>&1 +MAKEFLAGS=-r \ +$EXEC scc make -f test.mk file.o print-makeflags > $tmp1 2>&1 diff $tmp1 - <<EOF -r diff --git a/tests/make/execute/0022-Sflag.sh b/tests/make/execute/0022-Sflag.sh @@ -5,7 +5,8 @@ trap 'exit 1' HUP INT TERM tmp1=tmp1.$$ -MAKEFLAGS=-k scc make -Sf test.mk print-makeflags follow 2>&1 | +MAKEFLAGS=-k \ +$EXEC scc make -Sf test.mk print-makeflags follow 2>&1 | sed 's/:.*: no-/: no-/' > $tmp1 diff $tmp1 - <<EOF diff --git a/tests/make/execute/0023-Sflag.sh b/tests/make/execute/0023-Sflag.sh @@ -5,7 +5,8 @@ trap 'exit 1' HUP INT TERM tmp1=tmp1.$$ -MAKEFLAGS=-S scc make -kf test.mk print-makeflags follow 2>&1 | +MAKEFLAGS=-S \ +$EXEC scc make -kf test.mk print-makeflags follow 2>&1 | sed 's/:.*: *no-/: no-/' > $tmp1 diff $tmp1 - <<EOF diff --git a/tests/make/execute/0024-sflag.sh b/tests/make/execute/0024-sflag.sh @@ -5,7 +5,7 @@ trap 'exit 1' HUP INT TERM tmp1=tmp1.$$ -scc make -sf test.mk print-makeflags echo-hello > $tmp1 2>&1 +$EXEC scc make -sf test.mk print-makeflags echo-hello > $tmp1 2>&1 diff $tmp1 - <<EOF -s diff --git a/tests/make/execute/0025-sflag.sh b/tests/make/execute/0025-sflag.sh @@ -5,7 +5,8 @@ trap 'exit 1' HUP INT TERM tmp1=tmp1.$$ -MAKEFLAGS=-s scc make -f test.mk print-makeflags echo-hello > $tmp1 2>&1 +MAKEFLAGS=-s \ +$EXEC scc make -f test.mk print-makeflags echo-hello > $tmp1 2>&1 diff $tmp1 - <<EOF -s diff --git a/tests/make/execute/0026-silent.sh b/tests/make/execute/0026-silent.sh @@ -5,7 +5,7 @@ trap 'exit 1' HUP INT TERM tmp1=tmp1.$$ -scc make -f test.mk silent-echo-hello >$tmp1 2>&1 +$EXEC scc make -f test.mk silent-echo-hello >$tmp1 2>&1 diff $tmp1 - <<EOF Hello World! diff --git a/tests/make/execute/0027-silent.sh b/tests/make/execute/0027-silent.sh @@ -5,7 +5,7 @@ trap 'exit 1' HUP INT TERM tmp1=tmp1.$$ -scc make -f - <<EOF > $tmp1 2>&1 +$EXEC scc make -f - <<EOF > $tmp1 2>&1 .SILENT: hello: diff --git a/tests/make/execute/0028-tflag.sh b/tests/make/execute/0028-tflag.sh @@ -5,7 +5,7 @@ trap 'exit 1' HUP INT TERM tmp1=tmp1.$$ -scc make -tf test.mk file1 > $tmp1 2>&1 +$EXEC scc make -tf test.mk file1 > $tmp1 2>&1 diff $tmp1 - <<EOF && test -f file1 touch file1 diff --git a/tests/make/execute/0029-tflag.sh b/tests/make/execute/0029-tflag.sh @@ -1,14 +1,11 @@ #!/bin/sh -trap 'rm -f $tmp1 $tmp2 file2' EXIT +trap 'rm -f $tmp1 file2' EXIT trap 'exit 1' HUP INT TERM tmp1=tmp1.$$ -tmp2=tmp2.$$ -cat > $tmp2 <<EOF -EOF - -scc make -tf test.mk file2 > $tmp1 2>&1 +$EXEC scc make -tf test.mk file2 > $tmp1 2>&1 -diff $tmp1 $tmp2 && ! test -f file2 +diff $tmp1 - <<EOF && ! test -f file2 +EOF diff --git a/tests/make/execute/0031-tflag.sh b/tests/make/execute/0031-tflag.sh @@ -5,7 +5,8 @@ trap 'exit 1' HUP INT TERM tmp1=tmp1.$$ -MAKEFLAGS=-t scc make -f test.mk print-makeflags-always > $tmp1 2>&1 +MAKEFLAGS=-t \ +$EXEC scc make -f test.mk print-makeflags-always > $tmp1 2>&1 diff -u $tmp1 - <<EOF && test -f print-makeflags-always -t diff --git a/tests/make/execute/0032-tflag.sh b/tests/make/execute/0032-tflag.sh @@ -8,6 +8,6 @@ tmp2=tmp2.$$ touch $tmp2 -scc make -stf test.mk file1 > $tmp1 2>&1 +$EXEC scc make -stf test.mk file1 > $tmp1 2>&1 diff $tmp1 $tmp2 && test -f file1 diff --git a/tests/make/execute/0033-macro.sh b/tests/make/execute/0033-macro.sh @@ -5,7 +5,7 @@ trap 'exit 1' HUP INT TERM tmp1=tmp1.$$ -scc make -f test.mk CC=pcc print-cc > $tmp1 2>&1 +$EXEC scc make -f test.mk CC=pcc print-cc > $tmp1 2>&1 diff $tmp1 - <<EOF pcc diff --git a/tests/make/execute/0034-macro.sh b/tests/make/execute/0034-macro.sh @@ -5,7 +5,8 @@ trap 'exit 1' HUP INT TERM tmp1=tmp1.$$ -MAKEFLAGS='-S CC=pcc' scc make -f test.mk print-cc > $tmp1 2>&1 +MAKEFLAGS='-S CC=pcc' \ +$EXEC scc make -f test.mk print-cc > $tmp1 2>&1 diff $tmp1 - <<EOF pcc diff --git a/tests/make/execute/0035-macro.sh b/tests/make/execute/0035-macro.sh @@ -5,7 +5,8 @@ trap 'exit 1' HUP INT TERM tmp1=tmp1.$$ -MAKEFLAGS='-S CC=pcc' scc make -f test.mk print-env-cc > $tmp1 2>&1 +MAKEFLAGS='-S CC=pcc' \ +$EXEC scc make -f test.mk print-env-cc > $tmp1 2>&1 diff $tmp1 - <<EOF diff --git a/tests/make/execute/0036-macro.sh b/tests/make/execute/0036-macro.sh @@ -5,7 +5,7 @@ trap 'exit 1' HUP INT TERM tmp1=tmp1.$$ -scc make -f test.mk CC=pcc print-env-cc > $tmp1 2>&1 +$EXEC scc make -f test.mk CC=pcc print-env-cc > $tmp1 2>&1 diff $tmp1 - <<EOF pcc diff --git a/tests/make/execute/0037-macro.sh b/tests/make/execute/0037-macro.sh @@ -6,7 +6,7 @@ trap 'exit 1' HUP INT TERM tmp1=tmp1.$$ make=`command -v scc-make` -$make -f test.mk print-make > $tmp1 2>&1 +$EXEC $make -f test.mk print-make > $tmp1 2>&1 diff $tmp1 - <<EOF $make diff --git a/tests/make/execute/0038-rules.sh b/tests/make/execute/0038-rules.sh @@ -5,7 +5,7 @@ trap 'exit 1' HUP INT TERM tmp1=tmp1.$$ -scc make no-file > $tmp1 2>&1 +$EXEC scc make no-file > $tmp1 2>&1 diff $tmp1 - <<EOF make: error: don't know how to make no-file diff --git a/tests/make/execute/0039-rules.sh b/tests/make/execute/0039-rules.sh @@ -1,16 +1,16 @@ #!/bin/sh -trap 'rm -f $tmp1 $tmp2 file?' EXIT +trap 'rm -f $tmp1 file?' EXIT trap 'exit 1' HUP INT TERM tmp1=tmp1.$$ -tmp2=tmp2.$$ touch $tmp2 touch file2 touch file3 -scc make -f test.mk file3 > $tmp1 2>&1 +$EXEC scc make -f test.mk file3 > $tmp1 2>&1 -diff $tmp1 $tmp2 +diff $tmp1 - <<EOF +EOF diff --git a/tests/make/execute/0040-makefile.sh b/tests/make/execute/0040-makefile.sh @@ -10,7 +10,7 @@ hello: @echo Hello World!, makefile! EOF -scc make > $tmp1 2>&1 +$EXEC scc make > $tmp1 2>&1 diff $tmp1 - <<EOF Hello World!, makefile! diff --git a/tests/make/execute/0041-comment.sh b/tests/make/execute/0041-comment.sh @@ -5,7 +5,7 @@ trap 'exit 1' HUP INT TERM tmp1=tmp1.$$ -scc make -f - <<'EOF' > $tmp1 2>&1 +$EXEC scc make -f - <<'EOF' > $tmp1 2>&1 # full line comment all: @echo Hello World! diff --git a/tests/make/execute/0042-comment.sh b/tests/make/execute/0042-comment.sh @@ -5,7 +5,7 @@ trap 'exit 1' HUP INT TERM tmp1=tmp1.$$ -scc make -f - <<'EOF' > $tmp1 2>&1 +$EXEC scc make -f - <<'EOF' > $tmp1 2>&1 # blank line all: @echo Hello World! diff --git a/tests/make/execute/0043-comment.sh b/tests/make/execute/0043-comment.sh @@ -5,7 +5,7 @@ trap 'exit 1' HUP INT TERM tmp1=tmp1.$$ -scc make -f - <<'EOF' > $tmp1 2>&1 +$EXEC scc make -f - <<'EOF' > $tmp1 2>&1 all: @echo Hello World! # blank line diff --git a/tests/make/execute/0044-macro.sh b/tests/make/execute/0044-macro.sh @@ -5,7 +5,7 @@ trap 'exit 1' HUP INT TERM tmp1=tmp1.$$ -scc make -f - <<'EOF' > $tmp1 2>&1 +$EXEC scc make -f - <<'EOF' > $tmp1 2>&1 # Generic rules .SUFFIXES: .SUFFIXES: .c .map .dump .elf .bin\ diff --git a/tests/make/execute/0045-comment.sh b/tests/make/execute/0045-comment.sh @@ -5,7 +5,7 @@ trap 'exit 1 ' HUP INT TERM tmp1=tmp1.$$ -scc make -f - target1 <<EOF > $tmp1 2>&1 +$EXEC scc make -f - target1 <<EOF > $tmp1 2>&1 #esto es un comentario \ target1: ; echo hello target2: ; echo bye diff --git a/tests/make/execute/0046-makefile.sh b/tests/make/execute/0046-makefile.sh @@ -5,7 +5,7 @@ trap 'exit 1' HUP INT TERM tmp1=tmp1.$$ -scc make -f test.mk -f - hello <<EOF > $tmp1 2>&1 +$EXEC scc make -f test.mk -f - hello <<EOF > $tmp1 2>&1 hello: @echo Bye world! EOF diff --git a/tests/make/execute/0047-include.sh b/tests/make/execute/0047-include.sh @@ -5,7 +5,7 @@ trap 'exit 1' HUP INT TERM tmp1=tmp1.$$ -scc make -f- hello <<EOF > $tmp1 2>&1 +$EXEC scc make -f- hello <<EOF > $tmp1 2>&1 include test.mk EOF diff --git a/tests/make/execute/0048-include.sh b/tests/make/execute/0048-include.sh @@ -8,7 +8,7 @@ tmp2=tmp2.$$ touch $tmp2 -scc make -f- hello <<EOF > $tmp1 2>&1 +$EXEC scc make -f- hello <<EOF > $tmp1 2>&1 FILE = test.mk F = $tmp2 diff --git a/tests/make/execute/0049-rule.sh b/tests/make/execute/0049-rule.sh @@ -5,7 +5,7 @@ trap 'exit 1' HUP INT TERM tmp1=tmp1.$$ -scc make -f- <<EOF > $tmp1 2>&1 +$EXEC scc make -f- <<EOF > $tmp1 2>&1 hello: @echo Hello World!;\ echo Bye World! diff --git a/tests/make/execute/0050-rule.sh b/tests/make/execute/0050-rule.sh @@ -5,7 +5,7 @@ trap 'exit 1' HUP INT TERM tmp1=tmp1.$$ -scc make -f- <<EOF > $tmp1 2>&1 +$EXEC scc make -f- <<EOF > $tmp1 2>&1 hello: @echo Hello World!\ Bye World! diff --git a/tests/make/execute/0051-rule.sh b/tests/make/execute/0051-rule.sh @@ -6,7 +6,7 @@ trap 'exit 1' HUP INT TERM tmp1=tmp1.$$ (set -e - scc make -f- <<'EOF' + $EXEC scc make -f- <<'EOF' .POSIX: all: diff --git a/tests/make/execute/0052-rule.sh b/tests/make/execute/0052-rule.sh @@ -6,7 +6,7 @@ trap 'exit 1' HUP INT TERM tmp1=tmp1.$$ (set -e - scc make -f- <<'EOF' + $EXEC scc make -f- <<'EOF' .POSIX: all: diff --git a/tests/make/execute/0053-rule.sh b/tests/make/execute/0053-rule.sh @@ -6,7 +6,7 @@ trap 'exit 1' HUP INT TERM tmp1=tmp1.$$ (set -e - scc make -f- <<'EOF' + $EXEC scc make -f- <<'EOF' .POSIX: .IGNORE: all diff --git a/tests/make/execute/0054-rule.sh b/tests/make/execute/0054-rule.sh @@ -6,7 +6,7 @@ trap 'exit 1' HUP INT TERM tmp1=tmp1.$$ (set -e - scc make -f- <<'EOF' + $EXEC scc make -f- <<'EOF' .POSIX: .IGNORE: diff --git a/tests/make/execute/0055-rule.sh b/tests/make/execute/0055-rule.sh @@ -6,7 +6,7 @@ trap 'exit 1' HUP INT TERM tmp1=tmp1.$$ (set -e - scc make -if- <<'EOF' + $EXEC scc make -if- <<'EOF' .POSIX: all: diff --git a/tests/make/execute/0056-rule.sh b/tests/make/execute/0056-rule.sh @@ -6,7 +6,7 @@ trap 'exit 1' HUP INT TERM tmp1=tmp1.$$ echo 'all: ; @echo Hello World!' | -scc make -f- > $tmp1 2>&1 +$EXEC scc make -f- > $tmp1 2>&1 diff $tmp1 - <<EOF Hello World! diff --git a/tests/make/execute/0057-default.sh b/tests/make/execute/0057-default.sh @@ -5,7 +5,7 @@ trap 'exit 1' HUP INT TERM tmp1=tmp1.$$ -scc make -f- <<EOF > $tmp1 2>&1 +$EXEC scc make -f- <<EOF > $tmp1 2>&1 .DEFAULT: all @echo Hello World! EOF diff --git a/tests/make/execute/0058-default.sh b/tests/make/execute/0058-default.sh @@ -5,7 +5,7 @@ trap 'exit 1' HUP INT TERM tmp1=tmp1.$$ -scc make -f- no-target <<EOF > $tmp1 2>&1 +$EXEC scc make -f- no-target <<EOF > $tmp1 2>&1 .DEFAULT: @echo Hello World! EOF diff --git a/tests/make/execute/0059-macro.sh b/tests/make/execute/0059-macro.sh @@ -5,7 +5,7 @@ trap 'exit 1' HUP INT TERM tmp1=tmp1.$$ -scc make -f- <<'EOF' > $tmp1 2>&1 +$EXEC scc make -f- <<'EOF' > $tmp1 2>&1 VAR = hola # comment all: diff --git a/tests/make/execute/0060-macro.sh b/tests/make/execute/0060-macro.sh @@ -5,7 +5,7 @@ trap 'exit 1' HUP INT TERM tmp1=tmp1.$$ -scc make -f- <<'EOF' > $tmp1 2>&1 +$EXEC scc make -f- <<'EOF' > $tmp1 2>&1 VAR = hola # comment all: @echo "$(VAR)". diff --git a/tests/make/execute/0061-macro.sh b/tests/make/execute/0061-macro.sh @@ -5,7 +5,7 @@ trap 'exit 1' HUP INT TERM tmp1=tmp1.$$ -scc make -f- <<'EOF' > $tmp1 2>&1 +$EXEC scc make -f- <<'EOF' > $tmp1 2>&1 VAR = hello all: @echo ${VAR}-$(VAR) diff --git a/tests/make/execute/0062-macro.sh b/tests/make/execute/0062-macro.sh @@ -5,7 +5,7 @@ trap 'exit 1' HUP INT TERM tmp1=tmp1.$$ -scc make -f- all <<'EOF' > $tmp1 2>&1 +$EXEC scc make -f- all <<'EOF' > $tmp1 2>&1 TARGET = all $(TARGET): diff --git a/tests/make/execute/0063-macro.sh b/tests/make/execute/0063-macro.sh @@ -5,7 +5,7 @@ trap 'exit 1' HUP INT TERM tmp1=tmp1.$$ -scc make -f- all <<'EOF' > $tmp1 2>&1 +$EXEC scc make -f- all <<'EOF' > $tmp1 2>&1 TARGET = print all: $(TARGET) diff --git a/tests/make/execute/0064-macro.sh b/tests/make/execute/0064-macro.sh @@ -5,7 +5,7 @@ trap 'exit 1' HUP INT TERM tmp1=tmp1.$$ -scc make -f- all <<'EOF' > $tmp1 2>&1 +$EXEC scc make -f- all <<'EOF' > $tmp1 2>&1 VAR = guy all: diff --git a/tests/make/execute/0065-macro.sh b/tests/make/execute/0065-macro.sh @@ -5,7 +5,7 @@ trap 'exit 1' HUP INT TERM tmp1=tmp1.$$ -scc make -f- all <<'EOF' > $tmp1 2>&1 +$EXEC scc make -f- all <<'EOF' > $tmp1 2>&1 VAR = VAR2 $(VAR) = World diff --git a/tests/make/execute/0066-macro.sh b/tests/make/execute/0066-macro.sh @@ -5,7 +5,7 @@ trap 'exit 1' HUP INT TERM tmp1=tmp1.$$ -scc make -f- all <<'EOF' > $tmp1 2>&1 +$EXEC scc make -f- all <<'EOF' > $tmp1 2>&1 VAR2 = one VAR = $(VAR2) VAR2 = three diff --git a/tests/make/execute/0067-macro.sh b/tests/make/execute/0067-macro.sh @@ -5,7 +5,7 @@ trap 'exit 1' HUP INT TERM tmp1=tmp1.$$ -scc make -f- <<'EOF' > $tmp1 2>&1 +$EXEC scc make -f- <<'EOF' > $tmp1 2>&1 F = World G = Hello diff --git a/tests/make/execute/0068-macro.sh b/tests/make/execute/0068-macro.sh @@ -5,7 +5,7 @@ trap 'exit 1' HUP INT TERM tmp1=tmp1.$$ -scc make -f- <<'EOF' > $tmp1 2>&1 +$EXEC scc make -f- <<'EOF' > $tmp1 2>&1 SRC = file1.c file2.c all: diff --git a/tests/make/execute/0069-macro.sh b/tests/make/execute/0069-macro.sh @@ -5,7 +5,7 @@ trap 'exit 1' HUP INT TERM tmp1=tmp1.$$ -scc make -f- <<'EOF' > $tmp1 2>&1 +$EXEC scc make -f- <<'EOF' > $tmp1 2>&1 VAR1 = one VAR = Hello $(VAR1) VAR1 = two diff --git a/tests/make/execute/0070-macro.sh b/tests/make/execute/0070-macro.sh @@ -5,7 +5,7 @@ trap 'exit 1' HUP INT TERM tmp1=tmp1.$$ -scc make -f- <<'EOF' > $tmp1 2>&1 +$EXEC scc make -f- <<'EOF' > $tmp1 2>&1 VAR1 = one VAR = $(VAR1) VAR1 = print diff --git a/tests/make/execute/0071-macro.sh b/tests/make/execute/0071-macro.sh @@ -5,7 +5,8 @@ trap 'exit 1' HUP INT TERM tmp1=tmp1.$$ -CC=dcc MAKEFLAGS='-S CC=gcc' scc make -f- CC=pcc <<'EOF' > $tmp1 2>&1 +CC=dcc MAKEFLAGS='-S CC=gcc' \ +$EXEC scc make -f- CC=pcc <<'EOF' > $tmp1 2>&1 CC=tcc all: diff --git a/tests/make/execute/0072-macro.sh b/tests/make/execute/0072-macro.sh @@ -5,7 +5,8 @@ trap 'exit 1' HUP INT TERM tmp1=tmp1.$$ -CC=dcc MAKEFLAGS='-S CC=gcc' scc make -f- <<'EOF' > $tmp1 2>&1 +CC=dcc MAKEFLAGS='-S CC=gcc' \ +$EXEC scc make -f- <<'EOF' > $tmp1 2>&1 CC=tcc all: diff --git a/tests/make/execute/0073-macro.sh b/tests/make/execute/0073-macro.sh @@ -5,7 +5,8 @@ trap 'exit 1' HUP INT TERM tmp1=tmp1.$$ -CC=dcc scc make -f- <<'EOF' > $tmp1 2>&1 +CC=dcc \ +$EXEC scc make -f- <<'EOF' > $tmp1 2>&1 CC=tcc all: diff --git a/tests/make/execute/0074-macro.sh b/tests/make/execute/0074-macro.sh @@ -5,7 +5,8 @@ trap 'exit 1' HUP INT TERM tmp1=tmp1.$$ -CC=dcc scc make -f- <<'EOF' > $tmp1 2>&1 +CC=dcc \ +$EXEC scc make -f- <<'EOF' > $tmp1 2>&1 all: @echo CC=$(CC) EOF diff --git a/tests/make/execute/0075-macro.sh b/tests/make/execute/0075-macro.sh @@ -5,7 +5,8 @@ trap 'exit 1' HUP INT TERM tmp1=tmp1.$$ -CC=dcc scc make -ef- <<'EOF' > $tmp1 2>&1 +CC=dcc \ +$EXEC scc make -ef- <<'EOF' > $tmp1 2>&1 all: @echo CC=$(CC) EOF diff --git a/tests/make/execute/0076-macro.sh b/tests/make/execute/0076-macro.sh @@ -5,7 +5,8 @@ trap 'exit 1' HUP INT TERM tmp1=tmp1.$$ -CC=dcc MAKEFLAGS='-S CC=gcc' scc make -ef- CC=pcc <<'EOF' > $tmp1 2>&1 +CC=dcc MAKEFLAGS='-S CC=gcc' \ +$EXEC scc make -ef- CC=pcc <<'EOF' > $tmp1 2>&1 CC=tcc all: diff --git a/tests/make/execute/0077-macro.sh b/tests/make/execute/0077-macro.sh @@ -5,7 +5,8 @@ trap 'exit 1' HUP INT TERM tmp1=tmp1.$$ -SHELL=foo scc make -f- <<'EOF' > $tmp1 2>&1 +SHELL=foo \ +$EXEC scc make -f- <<'EOF' > $tmp1 2>&1 all: @echo $(SHELL) EOF diff --git a/tests/make/execute/0078-macro.sh b/tests/make/execute/0078-macro.sh @@ -5,7 +5,8 @@ trap 'exit 1' HUP INT TERM tmp1=tmp1.$$ -SHELL=foo scc make -f- SHELL=/bin/sh <<'EOF' > $tmp1 2>&1 +SHELL=foo \ +$EXEC scc make -f- SHELL=/bin/sh <<'EOF' > $tmp1 2>&1 all: @echo $$SHELL EOF diff --git a/tests/make/execute/0079-macro.sh b/tests/make/execute/0079-macro.sh @@ -5,7 +5,8 @@ trap 'exit 1' HUP INT TERM tmp1=tmp1.$$ -SHELL=foo scc make -f- <<'EOF' > $tmp1 2>&1 +SHELL=foo \ +$EXEC scc make -f- <<'EOF' > $tmp1 2>&1 SHELL = /bin/sh all: diff --git a/tests/make/execute/0080-rule.sh b/tests/make/execute/0080-rule.sh @@ -9,7 +9,7 @@ echo hello > $tmp echo hello > f.c -scc make -sf- <<'EOF' +$EXEC scc make -sf- <<'EOF' .c.o: cp $< $@ diff --git a/tests/make/execute/0081-rule.sh b/tests/make/execute/0081-rule.sh @@ -5,7 +5,7 @@ trap 'exit 1' HUP INT TERM echo hello > f.c -scc make -sf- <<'EOF' +$EXEC scc make -sf- <<'EOF' .c: echo hello > $@ diff --git a/tests/make/execute/0082-rule.sh b/tests/make/execute/0082-rule.sh @@ -7,7 +7,7 @@ tmp1=tmp1.$$ echo hello > f.c -scc make -sf- <<'EOF' > $tmp1 2>&1 +$EXEC scc make -sf- <<'EOF' > $tmp1 2>&1 .SUFFIXES: diff --git a/tests/make/execute/0083-rule.sh b/tests/make/execute/0083-rule.sh @@ -7,7 +7,7 @@ tmp1=tmp1.$$ echo dude > f.c -(scc make -f- <<'EOF' +($EXEC scc make -f- <<'EOF' f.o: @echo hello > $@ diff --git a/tests/make/execute/0084-rule.sh b/tests/make/execute/0084-rule.sh @@ -9,7 +9,7 @@ touch -t 200711121015 f1 f2 touch -t 200711121016 f touch -t 200711121017 f3 -(scc make -f- > $tmp1 2>&1) <<'EOF' +($EXEC scc make -f- > $tmp1 2>&1) <<'EOF' f: f1 f2 f3 @echo $? EOF diff --git a/tests/make/execute/0085-rule.sh b/tests/make/execute/0085-rule.sh @@ -7,7 +7,7 @@ tmp1=tmp1.$$ echo Hello > t1.c -scc make -f- <<'EOF' > $tmp1 2>&1 +$EXEC scc make -f- <<'EOF' > $tmp1 2>&1 .c.o: @echo $* > $@ diff --git a/tests/make/execute/0086-rule.sh b/tests/make/execute/0086-rule.sh @@ -5,7 +5,7 @@ trap 'exit 1' HUP INT TERM tmp1=tmp1.$$ -scc make -f- <<'EOF' > $tmp1 2>&1 +$EXEC scc make -f- <<'EOF' > $tmp1 2>&1 all: t1 t2 t1 t2: t diff --git a/tests/make/execute/0087-rule.sh b/tests/make/execute/0087-rule.sh @@ -5,7 +5,7 @@ trap 'exit 1' HUP INT TERM tmp1=tmp1.$$ -scc make -f- <<'EOF' > $tmp1 2>&1 +$EXEC scc make -f- <<'EOF' > $tmp1 2>&1 all: @echo '#error line' EOF diff --git a/tests/make/execute/0088-comment.sh b/tests/make/execute/0088-comment.sh @@ -5,7 +5,7 @@ trap 'exit 1' HUP INT TERM tmp1=tmp1.$$ -scc make -f- <<'EOF' > $tmp1 2>&1 +$EXEC scc make -f- <<'EOF' > $tmp1 2>&1 all: @echo Hello # This is a comment diff --git a/tests/make/execute/0089-comment.sh b/tests/make/execute/0089-comment.sh @@ -5,7 +5,7 @@ trap 'rm -f $tmp1' HUP INT TERM tmp1=tmp1.$$ -scc make -f- <<'EOF' > $tmp1 2>&1 +$EXEC scc make -f- <<'EOF' > $tmp1 2>&1 VAR = Hello World! # This is a comment all: @echo '$(VAR)' diff --git a/tests/make/execute/0090-comment.sh b/tests/make/execute/0090-comment.sh @@ -5,7 +5,7 @@ trap 'exit 1' HUP INT TERM tmp1=tmp1.$$ -scc make -f- <<'EOF' > $tmp1 2>&1 +$EXEC scc make -f- <<'EOF' > $tmp1 2>&1 all: # This is a comment @echo Hello World! EOF diff --git a/tests/make/execute/0091-expansion.sh b/tests/make/execute/0091-expansion.sh @@ -5,7 +5,7 @@ trap 'exit 1' HUP INT TERM tmp1=tmp1.$$ -scc make -f- <<'EOF' > $tmp1 2>&1 +$EXEC scc make -f- <<'EOF' > $tmp1 2>&1 STARGET = all b.$(STARGET): b$(STARGET) diff --git a/tests/make/execute/0092-expansion.sh b/tests/make/execute/0092-expansion.sh @@ -5,7 +5,7 @@ trap 'exit 1' HUP INT TERM tmp1=tmp1.$$ -scc make -f- <<'EOF' > $tmp1 2>&1 +$EXEC scc make -f- <<'EOF' > $tmp1 2>&1 VAR =\ all\ f1\ diff --git a/tests/make/execute/0093-inference.sh b/tests/make/execute/0093-inference.sh @@ -13,7 +13,7 @@ all: f.o EOF (touch f.c f.h -scc make -f $tmp1 +$EXEC scc make -f $tmp1 touch f.c scc make -f $tmp1) > $tmp2 diff --git a/tests/make/execute/0094-expansion.sh b/tests/make/execute/0094-expansion.sh @@ -5,7 +5,7 @@ trap 'exit 1' HUP INT TERM tmp1=tmp1.$$ -scc make -f- <<'EOF' > $tmp1 2>&1 +$EXEC scc make -f- <<'EOF' > $tmp1 2>&1 O = o SRC = file1.c file2.c OBJ = $(SRC:.c=.$O) diff --git a/tests/make/execute/0095-include.sh b/tests/make/execute/0095-include.sh @@ -5,7 +5,7 @@ trap 'exit 1' HUP INT TERM tmp1=tmp1.$$ -scc make -f- MK=test.mk hello <<'EOF' > $tmp1 2>&1 +$EXEC scc make -f- MK=test.mk hello <<'EOF' > $tmp1 2>&1 MK = fail.mk include $(MK) EOF diff --git a/tests/make/execute/0096-escape.sh b/tests/make/execute/0096-escape.sh @@ -5,7 +5,7 @@ trap 'exit 1' HUP INT TERM tmp1=tmp1.$$ -scc make -f- <<'EOF' > $tmp1 2>&1 +$EXEC scc make -f- <<'EOF' > $tmp1 2>&1 MACRO = $$(echo hello) all: diff --git a/tests/make/execute/0097-rule.sh b/tests/make/execute/0097-rule.sh @@ -5,7 +5,7 @@ trap 'exit 1' HUP INT TERM tmp1=tmp1.$$ -scc make -f- <<'EOF' > $tmp1 2>&1 +$EXEC scc make -f- <<'EOF' > $tmp1 2>&1 all: f1.o f1.o: f1.c diff --git a/tests/make/execute/0098-signal.sh b/tests/make/execute/0098-signal.sh @@ -17,7 +17,7 @@ rm -f file.txt trap 'cleanup 0' EXIT trap 'cleanup 1' INT TERM HUP -scc make -f - <<'EOF' & +$EXEC scc make -f - <<'EOF' & file.txt: @touch $@ @while : ; do sleep 1 ; done diff --git a/tests/make/execute/0099-signal.sh b/tests/make/execute/0099-signal.sh @@ -14,7 +14,7 @@ rm -f file.txt trap 'cleanup 0' EXIT trap 'cleanup 1' INT TERM HUP -scc make -nf - test.txt <<'EOF' & +$EXEC scc make -nf - test.txt <<'EOF' & test.txt: @+touch $@ +@while : ; do sleep 1 ; done diff --git a/tests/make/execute/0100-signal.sh b/tests/make/execute/0100-signal.sh @@ -14,7 +14,7 @@ rm -f file.txt trap 'cleanup 0' EXIT trap 'cleanup 1' INT TERM HUP -scc make -f - test.txt <<'EOF' & +$EXEC scc make -f - test.txt <<'EOF' & .PRECIOUS: test.txt test.txt: diff --git a/tests/make/execute/0101-signal.sh b/tests/make/execute/0101-signal.sh @@ -14,7 +14,7 @@ rm -f file.txt trap 'cleanup 0' EXIT trap 'cleanup 1' INT TERM HUP -scc make -qf - test.txt <<'EOF' & +$EXEC scc make -qf - test.txt <<'EOF' & test.txt: @+touch $@ +@while : ; do sleep 1 ; done diff --git a/tests/make/execute/0102-signal.sh b/tests/make/execute/0102-signal.sh @@ -14,7 +14,7 @@ rm -rf adir trap 'cleanup 0' EXIT trap 'cleanup 1' INT TERM HUP -scc make -f - <<'EOF' & +$EXEC scc make -f - <<'EOF' & adir: @mkdir $@ @while : ; do sleep 1 ; done diff --git a/tests/make/execute/0103-env.sh b/tests/make/execute/0103-env.sh @@ -7,7 +7,7 @@ trap 'exit 1' HUP INT TERM tmp1=tmp1.$$ -scc make -f - <<'EOF' > $tmp1 2>&1 +$EXEC scc make -f - <<'EOF' > $tmp1 2>&1 FLAGS=Hello $(EFLAGS) all: @echo $(FLAGS) diff --git a/tests/make/execute/0104-env.sh b/tests/make/execute/0104-env.sh @@ -7,7 +7,7 @@ trap 'exit 1' HUP INT TERM tmp1=tmp1.$$ -scc make -f - <<'EOF' > $tmp1 2>&1 +$EXEC scc make -f - <<'EOF' > $tmp1 2>&1 FLAGS=Hello $(CFLAGS) all: @echo Hello $(CFLAGS) diff --git a/tests/make/execute/0105-include.sh b/tests/make/execute/0105-include.sh @@ -5,7 +5,7 @@ trap 'exit 1' HUP INT TERM tmp1=tmp1.$$ -scc make -f - <<'EOF' > $tmp1 2>&1 +$EXEC scc make -f - <<'EOF' > $tmp1 2>&1 prefix = /usr/local includedir = ${prefix}/include diff --git a/tests/make/execute/0106-inference.sh b/tests/make/execute/0106-inference.sh @@ -8,7 +8,7 @@ tmp1=tmp1.$$ touch -d '1970-01-01 00:00:01' f.c touch -d '1970-01-01 00:00:02' f.o touch -d '1970-01-01 00:00:03' f.h -scc make -f - <<'EOF' > $tmp1 2>&1 +$EXEC scc make -f - <<'EOF' > $tmp1 2>&1 f.o: f.h all: f.o diff --git a/tests/make/execute/0107-inference.sh b/tests/make/execute/0107-inference.sh @@ -17,7 +17,7 @@ touch -d '1970-01-01 00:00:01' f.h touch -d '1970-01-01 00:00:03' f touch -d '1970-01-01 00:00:04' f.c -scc make -f- <<'EOF' > $tmp1 2>&1 +$EXEC scc make -f- <<'EOF' > $tmp1 2>&1 f: f.h f.h: diff --git a/tests/make/execute/0108-lastopt.sh b/tests/make/execute/0108-lastopt.sh @@ -5,17 +5,17 @@ trap 'exit 1' HUP INT TERM tmp1=tmp1.$$ -(scc make -f- -- -42 <<'EOF' +($EXEC scc make -f- -- -42 <<'EOF' -42: @echo 'hyphen-target' EOF -scc make -f- -- MYVAR=-42 <<'EOF' +$EXEC scc make -f- -- MYVAR=-42 <<'EOF' all: @@echo MYVAR is $(MYVAR) EOF -scc make -f- -- MYVAR=myval -42 <<'EOF' +$EXEC scc make -f- -- MYVAR=myval -42 <<'EOF' -42: @echo MYVAR is $(MYVAR) EOF diff --git a/tests/nm/execute/0001-z80.sh b/tests/nm/execute/0001-z80.sh @@ -7,7 +7,7 @@ trap 'exit 1' HUP INT TERM tmp1=tmp1.$$ -scc nm z80.out > $tmp1 +$EXEC scc nm z80.out > $tmp1 diff $tmp1 - <<! 0000000000000000 b .bss diff --git a/tests/nm/execute/0002-z80-u.sh b/tests/nm/execute/0002-z80-u.sh @@ -7,7 +7,7 @@ trap 'exit 1' HUP INT TERM tmp1=tmp1.$$ -scc nm -u z80.out > $tmp1 +$EXEC scc nm -u z80.out > $tmp1 diff $tmp1 - <<! U text6 diff --git a/tests/nm/execute/0003-z80-g.sh b/tests/nm/execute/0003-z80-g.sh @@ -7,7 +7,7 @@ trap 'exit 1' HUP INT TERM tmp1=tmp1.$$ -scc nm -g z80.out > $tmp1 +$EXEC scc nm -g z80.out > $tmp1 diff $tmp1 - <<! 0000000000000001 B averylongbss diff --git a/tests/nm/execute/0004-z80-v.sh b/tests/nm/execute/0004-z80-v.sh @@ -7,7 +7,7 @@ trap 'exit 1' HUP INT TERM tmp1=tmp1.$$ -scc nm -v z80.out > $tmp1 +$EXEC scc nm -v z80.out > $tmp1 diff $tmp1 - <<! U text6 diff --git a/tests/nm/execute/0005-z80-A.sh b/tests/nm/execute/0005-z80-A.sh @@ -8,10 +8,10 @@ trap 'exit 1' HUP INT TERM tmp1=tmp1.$$ rm -f f.a -scc-ar -qv f.a z80.out +$EXEC scc-ar -qv f.a z80.out cp z80.out f.out -scc-ar -qv f.a f.out -scc nm -A f.a z80.out > $tmp1 +$EXEC scc-ar -qv f.a f.out +$EXEC scc nm -A f.a z80.out > $tmp1 diff $tmp1 - <<! f.a[z80.out]: 0000000000000000 b .bss diff --git a/tests/nm/execute/0006-z80-o.sh b/tests/nm/execute/0006-z80-o.sh @@ -7,7 +7,7 @@ trap 'exit 1' HUP INT TERM tmp1=tmp1.$$ -scc nm -t o z80.out > $tmp1 +$EXEC scc nm -t o z80.out > $tmp1 diff $tmp1 - <<! 0000000000000000 b .bss diff --git a/tests/nm/execute/0007-z80-d.sh b/tests/nm/execute/0007-z80-d.sh @@ -7,7 +7,7 @@ trap 'exit 1' HUP INT TERM tmp1=tmp1.$$ -scc nm -t d z80.out > $tmp1 +$EXEC scc nm -t d z80.out > $tmp1 diff $tmp1 - <<! 0000000000000000 b .bss diff --git a/tests/nm/execute/0008-z80-x.sh b/tests/nm/execute/0008-z80-x.sh @@ -7,7 +7,7 @@ trap 'exit 1' HUP INT TERM tmp1=tmp1.$$ -scc nm -t x z80.out > $tmp1 +$EXEC scc nm -t x z80.out > $tmp1 diff $tmp1 - <<! 0000000000000000 b .bss diff --git a/tests/nm/execute/0009-z80-P-o.sh b/tests/nm/execute/0009-z80-P-o.sh @@ -7,7 +7,7 @@ trap 'exit 1' HUP INT TERM tmp1=tmp1.$$ -scc nm -P -t o z80.out > $tmp1 +$EXEC scc nm -P -t o z80.out > $tmp1 diff $tmp1 - <<! .bss b 0000000000000000 0 diff --git a/tests/nm/execute/0010-z80-P-d.sh b/tests/nm/execute/0010-z80-P-d.sh @@ -7,7 +7,7 @@ trap 'exit 1' HUP INT TERM tmp1=tmp1.$$ -scc nm -P -t x z80.out > $tmp1 +$EXEC scc nm -P -t x z80.out > $tmp1 diff $tmp1 - <<! .bss b 0000000000000000 0 diff --git a/tests/nm/execute/0011-z80-P-x.sh b/tests/nm/execute/0011-z80-P-x.sh @@ -7,7 +7,7 @@ trap 'exit 1' HUP INT TERM tmp1=tmp1.$$ -scc nm -P -t x z80.out > $tmp1 +$EXEC scc nm -P -t x z80.out > $tmp1 diff $tmp1 - <<! .bss b 0000000000000000 0 diff --git a/tests/nm/execute/0012-z80-f.sh b/tests/nm/execute/0012-z80-f.sh @@ -6,7 +6,7 @@ trap 'rm -f $tmp1' EXIT trap 'exit 1' HUP INT TERM tmp1=tmp1.$$ -scc nm -f z80.out > $tmp1 +$EXEC scc nm -f z80.out > $tmp1 diff $tmp1 - <<! 0000000000000000 b .bss diff --git a/tests/nm/execute/0013-z80-a.sh b/tests/nm/execute/0013-z80-a.sh @@ -7,7 +7,7 @@ trap 'exit 1' HUP INT TERM tmp1=tmp1.$$ -scc nm -a z80.out > $tmp1 +$EXEC scc nm -a z80.out > $tmp1 diff $tmp1 - <<! 0000000000000000 b .bss diff --git a/tests/size/execute/0001-z80.sh b/tests/size/execute/0001-z80.sh @@ -7,7 +7,7 @@ trap 'exit 1' HUP INT TERM tmp1=tmp1.$$ -scc size z80.out >$tmp1 +$EXEC scc size z80.out >$tmp1 diff $tmp1 - <<EOF text data bss dec hex filename diff --git a/tests/size/execute/0002-z80-t.sh b/tests/size/execute/0002-z80-t.sh @@ -7,7 +7,7 @@ trap 'exit 1' HUP INT TERM tmp1=tmp1.$$ -scc size -t z80.out z80.out>$tmp1 +$EXEC scc size -t z80.out z80.out>$tmp1 diff $tmp1 - <<EOF text data bss dec hex filename diff --git a/tests/strip/execute/0001-z80.sh b/tests/strip/execute/0001-z80.sh @@ -9,8 +9,8 @@ tmp1=tmp1.$$ tmp2=tmp2.$$ cp z80.out $tmp1 -scc strip $tmp1 > $tmp2 -scc nm $tmp1 >> $tmp2 2>&1 || true +$EXEC scc strip $tmp1 > $tmp2 +$EXEC scc nm $tmp1 >> $tmp2 2>&1 || true diff $tmp2 - <<EOF nm: $tmp1: no symbols