commit 17eda908a2eea78db338611b990413acf48d89d6 parent a12330ef03ccad16f2356827fd15e87fd55afa89 Author: Roberto E. Vargas Caballero <k0ga@shike2.com> Date: Tue, 12 Nov 2024 22:30:49 +0100 tests/make: Use new scc wrapper in the tests This make easier to use scc-make from other directories. Diffstat:
97 files changed, 102 insertions(+), 101 deletions(-)
diff --git a/tests/make/execute/0001-rule.sh b/tests/make/execute/0001-rule.sh @@ -4,7 +4,7 @@ trap 'rm -f $tmp1 $tmp2' EXIT INT QUIT HUP TERM tmp1=tmp1.$$ tmp2=tmp2.$$ -scc-make hello > $tmp1 2>&1 +scc make hello > $tmp1 2>&1 echo Hello World! > $tmp2 diff $tmp1 $tmp2 diff --git a/tests/make/execute/0002-fflag.sh b/tests/make/execute/0002-fflag.sh @@ -5,7 +5,7 @@ trap 'rm -f $tmp1 $tmp2' EXIT INT QUIT HUP TERM tmp1=tmp1.$$ tmp2=tmp2.$$ -scc-make -f test.mk print-cc print-makeflags > $tmp1 2>&1 +scc make -f test.mk print-cc print-makeflags > $tmp1 2>&1 cat <<EOF > $tmp2 c99 diff --git a/tests/make/execute/0003-fflag.sh b/tests/make/execute/0003-fflag.sh @@ -5,7 +5,7 @@ trap 'rm -f $tmp1 $tmp2' EXIT INT QUIT HUP TERM tmp1=tmp1.$$ tmp2=tmp2.$$ -scc-make -ftest.mk print-cc print-makeflags > $tmp1 2>&1 +scc make -ftest.mk print-cc print-makeflags > $tmp1 2>&1 cat <<EOF > $tmp2 c99 diff --git a/tests/make/execute/0004-fflag.sh b/tests/make/execute/0004-fflag.sh @@ -5,7 +5,7 @@ trap 'rm -f $tmp1 $tmp2' EXIT INT QUIT HUP TERM tmp1=tmp1.$$ tmp2=tmp2.$$ -MAKEFLAGS=-fff.mk scc-make -f test.mk print-cc print-makeflags > $tmp1 2>&1 +MAKEFLAGS=-fff.mk scc make -f test.mk print-cc print-makeflags > $tmp1 2>&1 cat <<EOF > $tmp2 c99 diff --git a/tests/make/execute/0005-fflag.sh b/tests/make/execute/0005-fflag.sh @@ -5,7 +5,7 @@ trap 'rm -f $tmp1 $tmp2' EXIT INT QUIT HUP TERM tmp1=tmp1.$$ tmp2=tmp2.$$ -MAKEFLAGS=ffff.mk scc-make -f test.mk print-cc print-makeflags > $tmp1 2>&1 +MAKEFLAGS=ffff.mk scc make -f test.mk print-cc print-makeflags > $tmp1 2>&1 cat <<EOF > $tmp2 c99 diff --git a/tests/make/execute/0006-iflag.sh b/tests/make/execute/0006-iflag.sh @@ -11,7 +11,7 @@ sh: no-valid-program: not found -i EOF -scc-make -if test.mk error print-makeflags 2>&1 | +scc make -if test.mk error print-makeflags 2>&1 | sed 's/sh:.*: *no-/sh: no-/' > $tmp1 2>&1 diff $tmp1 $tmp2 diff --git a/tests/make/execute/0007-iflag.sh b/tests/make/execute/0007-iflag.sh @@ -11,7 +11,7 @@ sh: no-valid-program: not found -i EOF -MAKEFLAGS=-i scc-make -f test.mk error print-makeflags 2>&1 | +MAKEFLAGS=-i scc make -f test.mk error print-makeflags 2>&1 | sed 's/sh:.*: *no-/sh: no-/' > $tmp1 2>&1 diff $tmp1 $tmp2 diff --git a/tests/make/execute/0008-ignore.sh b/tests/make/execute/0008-ignore.sh @@ -11,7 +11,7 @@ sh: no-valid-program: not found Hello World! EOF -scc-make -f test.mk ignored-error hello 2>&1 | +scc make -f test.mk ignored-error hello 2>&1 | sed 's/sh:.*: *no-/sh: no-/' > $tmp1 2>&1 diff $tmp1 $tmp2 diff --git a/tests/make/execute/0009-ignore.sh b/tests/make/execute/0009-ignore.sh @@ -11,7 +11,7 @@ sh: no-valid-program: not found make: error: don't know how to make hello EOF -(scc-make -f - error hello 2>&1 | +(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 @@ -15,7 +15,7 @@ make: warning: target follow not remade because of errors EOF (set -e - scc-make -kf test.mk print-makeflags follow + 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 @@ -15,7 +15,7 @@ make: warning: target follow not remade because of errors EOF (set -e - MAKEFLAGS=-k scc-make -f test.mk print-makeflags follow + MAKEFLAGS=-k 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 @@ -12,7 +12,7 @@ correct EOF (set -e - scc-make -f test.mk -n print-makeflags error + scc make -f test.mk -n print-makeflags error echo correct) > $tmp1 2>&1 diff $tmp1 $tmp2 diff --git a/tests/make/execute/0013-nflag.sh b/tests/make/execute/0013-nflag.sh @@ -12,7 +12,7 @@ correct EOF (set -e - MAKEFLAGS=-n scc-make -f test.mk print-makeflags error + MAKEFLAGS=-n scc make -f test.mk print-makeflags error echo correct) > $tmp1 2>&1 diff $tmp1 $tmp2 diff --git a/tests/make/execute/0014-nflag.sh b/tests/make/execute/0014-nflag.sh @@ -10,6 +10,6 @@ echo Hello World! Hello World! EOF -scc-make -nf test.mk print-hidden-hello > $tmp1 2>&1 +scc make -nf test.mk print-hidden-hello > $tmp1 2>&1 diff $tmp1 $tmp2 diff --git a/tests/make/execute/0015-pflag.sh b/tests/make/execute/0015-pflag.sh @@ -73,7 +73,7 @@ all: EOF -(scc-make -pf - > $tmp1 2>&1) <<'EOF' +(scc make -pf - > $tmp1 2>&1) <<'EOF' all: EOF diff --git a/tests/make/execute/0016-qflag.sh b/tests/make/execute/0016-qflag.sh @@ -10,7 +10,7 @@ pass EOF (set -e - scc-make -qf test.mk test.mk + scc make -qf test.mk test.mk echo pass) > $tmp1 2>&1 diff $tmp1 $tmp2 diff --git a/tests/make/execute/0017-qflag.sh b/tests/make/execute/0017-qflag.sh @@ -8,7 +8,7 @@ tmp2=tmp3.$$ touch $tmp2 (set -e - scc-make -qf test.mk error + scc make -qf test.mk error echo fail) > $tmp1 2>&1 diff $tmp1 $tmp2 diff --git a/tests/make/execute/0018-qflag.sh b/tests/make/execute/0018-qflag.sh @@ -11,7 +11,7 @@ pass EOF (set -e - scc-make -qf test.mk print-makeflags-always + scc make -qf test.mk print-makeflags-always echo pass) > $tmp1 2>&1 diff $tmp1 $tmp2 diff --git a/tests/make/execute/0019-qflag.sh b/tests/make/execute/0019-qflag.sh @@ -11,7 +11,7 @@ pass EOF (set -e - MAKEFLAGS=-q scc-make -f test.mk print-makeflags-always + MAKEFLAGS=-q scc make -f test.mk print-makeflags-always echo pass) > $tmp1 2>&1 diff $tmp1 $tmp2 diff --git a/tests/make/execute/0020-rflag.sh b/tests/make/execute/0020-rflag.sh @@ -10,6 +10,6 @@ cat > $tmp2 <<EOF EOF touch file.c -scc-make -rf test.mk file.o print-makeflags > $tmp1 2>&1 +scc make -rf test.mk file.o print-makeflags > $tmp1 2>&1 diff $tmp1 $tmp2 diff --git a/tests/make/execute/0021-rflag.sh b/tests/make/execute/0021-rflag.sh @@ -10,6 +10,6 @@ cat > $tmp2 <<EOF EOF touch file.c -MAKEFLAGS=-r scc-make -f test.mk file.o print-makeflags > $tmp1 2>&1 +MAKEFLAGS=-r scc make -f test.mk file.o print-makeflags > $tmp1 2>&1 diff $tmp1 $tmp2 diff --git a/tests/make/execute/0022-Sflag.sh b/tests/make/execute/0022-Sflag.sh @@ -12,7 +12,7 @@ sh: no-valid-program: not found make: error: target error: error 32512 EOF -MAKEFLAGS=-k scc-make -Sf test.mk print-makeflags follow 2>&1 | +MAKEFLAGS=-k scc make -Sf test.mk print-makeflags follow 2>&1 | sed 's/:.*: no-/: no-/' > $tmp1 diff $tmp1 $tmp2 diff --git a/tests/make/execute/0023-Sflag.sh b/tests/make/execute/0023-Sflag.sh @@ -14,7 +14,7 @@ Hello World! make: warning: target follow not remade because of errors EOF -MAKEFLAGS=-S scc-make -kf test.mk print-makeflags follow 2>&1 | +MAKEFLAGS=-S scc make -kf test.mk print-makeflags follow 2>&1 | sed 's/:.*: *no-/: no-/' > $tmp1 diff $tmp1 $tmp2 diff --git a/tests/make/execute/0024-sflag.sh b/tests/make/execute/0024-sflag.sh @@ -10,6 +10,6 @@ cat >$tmp2 <<EOF Hello World! EOF -scc-make -sf test.mk print-makeflags echo-hello > $tmp1 2>&1 +scc make -sf test.mk print-makeflags echo-hello > $tmp1 2>&1 diff $tmp1 $tmp2 diff --git a/tests/make/execute/0025-sflag.sh b/tests/make/execute/0025-sflag.sh @@ -10,6 +10,6 @@ cat >$tmp2 <<EOF Hello World! EOF -MAKEFLAGS=-s scc-make -f test.mk print-makeflags echo-hello > $tmp1 2>&1 +MAKEFLAGS=-s scc make -f test.mk print-makeflags echo-hello > $tmp1 2>&1 diff $tmp1 $tmp2 diff --git a/tests/make/execute/0026-silent.sh b/tests/make/execute/0026-silent.sh @@ -9,6 +9,6 @@ cat > $tmp2 <<EOF Hello World! EOF -scc-make -f test.mk silent-echo-hello >$tmp1 2>&1 +scc make -f test.mk silent-echo-hello >$tmp1 2>&1 diff $tmp1 $tmp2 diff --git a/tests/make/execute/0027-silent.sh b/tests/make/execute/0027-silent.sh @@ -9,7 +9,7 @@ cat >$tmp2 <<EOF Hello World! EOF -scc-make -f - <<EOF > $tmp1 2>&1 +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 @@ -9,6 +9,6 @@ cat > $tmp2 <<EOF touch file1 EOF -scc-make -tf test.mk file1 > $tmp1 2>&1 +scc make -tf test.mk file1 > $tmp1 2>&1 diff $tmp1 $tmp2 && test -f file1 diff --git a/tests/make/execute/0029-tflag.sh b/tests/make/execute/0029-tflag.sh @@ -8,6 +8,6 @@ tmp2=tmp2.$$ cat > $tmp2 <<EOF EOF -scc-make -tf test.mk file2 > $tmp1 2>&1 +scc make -tf test.mk file2 > $tmp1 2>&1 diff $tmp1 $tmp2 && ! test -f file2 diff --git a/tests/make/execute/0030-tflag.sh b/tests/make/execute/0030-tflag.sh @@ -12,6 +12,6 @@ touch file.c touch file.o EOF -scc-make -tf test.mk file.o > $tmp1 2>&1 +scc make -tf test.mk file.o > $tmp1 2>&1 diff $tmp1 $tmp2 && test -f file.c -a -f file.o diff --git a/tests/make/execute/0031-tflag.sh b/tests/make/execute/0031-tflag.sh @@ -10,6 +10,6 @@ cat > $tmp2 <<EOF touch print-makeflags-always EOF -MAKEFLAGS=-t scc-make -f test.mk print-makeflags-always > $tmp1 2>&1 +MAKEFLAGS=-t scc make -f test.mk print-makeflags-always > $tmp1 2>&1 diff -u $tmp1 $tmp2 && test -f print-makeflags-always diff --git a/tests/make/execute/0032-tflag.sh b/tests/make/execute/0032-tflag.sh @@ -7,6 +7,6 @@ tmp2=tmp2.$$ touch $tmp2 -scc-make -stf test.mk file1 > $tmp1 2>&1 +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 @@ -7,6 +7,6 @@ tmp2=tmp2.$$ echo pcc > $tmp2 -scc-make -f test.mk CC=pcc print-cc > $tmp1 2>&1 +scc make -f test.mk CC=pcc print-cc > $tmp1 2>&1 diff $tmp1 $tmp2 diff --git a/tests/make/execute/0034-macro.sh b/tests/make/execute/0034-macro.sh @@ -7,6 +7,6 @@ tmp2=tmp2.$$ echo pcc > $tmp2 -MAKEFLAGS='-S CC=pcc' scc-make -f test.mk print-cc > $tmp1 2>&1 +MAKEFLAGS='-S CC=pcc' scc make -f test.mk print-cc > $tmp1 2>&1 diff $tmp1 $tmp2 diff --git a/tests/make/execute/0035-macro.sh b/tests/make/execute/0035-macro.sh @@ -7,6 +7,6 @@ tmp2=tmp2.$$ echo > $tmp2 -MAKEFLAGS='-S CC=pcc' scc-make -f test.mk print-env-cc > $tmp1 2>&1 +MAKEFLAGS='-S CC=pcc' scc make -f test.mk print-env-cc > $tmp1 2>&1 diff $tmp1 $tmp2 diff --git a/tests/make/execute/0036-macro.sh b/tests/make/execute/0036-macro.sh @@ -7,6 +7,6 @@ tmp2=tmp2.$$ echo pcc > $tmp2 -scc-make -f test.mk CC=pcc print-env-cc > $tmp1 2>&1 +scc make -f test.mk CC=pcc print-env-cc > $tmp1 2>&1 diff $tmp1 $tmp2 diff --git a/tests/make/execute/0037-macro.sh b/tests/make/execute/0037-macro.sh @@ -4,9 +4,10 @@ trap 'rm -f $tmp1 $tmp2' EXIT INT QUIT TERM HUP tmp1=tmp1.$$ tmp2=tmp2.$$ +make=`command -v scc-make` -echo ../../../bin/scc-make > $tmp2 +echo $make > $tmp2 -../../../bin/scc-make -f test.mk print-make > $tmp1 2>&1 +$make -f test.mk print-make > $tmp1 2>&1 diff $tmp1 $tmp2 diff --git a/tests/make/execute/0038-rules.sh b/tests/make/execute/0038-rules.sh @@ -7,6 +7,6 @@ tmp2=tmp2.$$ echo "make: error: don't know how to make no-file" > $tmp2 -scc-make no-file > $tmp1 2>&1 +scc make no-file > $tmp1 2>&1 diff $tmp1 $tmp2 diff --git a/tests/make/execute/0039-rules.sh b/tests/make/execute/0039-rules.sh @@ -10,6 +10,6 @@ touch $tmp2 touch file2 touch file3 -scc-make -f test.mk file3 > $tmp1 2>&1 +scc make -f test.mk file3 > $tmp1 2>&1 diff $tmp1 $tmp2 diff --git a/tests/make/execute/0040-makefile.sh b/tests/make/execute/0040-makefile.sh @@ -14,6 +14,6 @@ cat > $tmp2 <<EOF Hello World!, makefile! EOF -scc-make > $tmp1 2>&1 +scc make > $tmp1 2>&1 diff $tmp1 $tmp2 diff --git a/tests/make/execute/0041-comment.sh b/tests/make/execute/0041-comment.sh @@ -7,7 +7,7 @@ tmp2=tmp2.$$ echo Hello World! > $tmp2 -scc-make -f - <<'EOF' > $tmp1 +scc make -f - <<'EOF' > $tmp1 # full line comment all: @echo Hello World! diff --git a/tests/make/execute/0042-comment.sh b/tests/make/execute/0042-comment.sh @@ -7,7 +7,7 @@ tmp2=tmp2.$$ echo Hello World! > $tmp2 -scc-make -f - <<'EOF' > $tmp1 +scc make -f - <<'EOF' > $tmp1 # blank line all: @echo Hello World! diff --git a/tests/make/execute/0043-comment.sh b/tests/make/execute/0043-comment.sh @@ -7,7 +7,7 @@ tmp2=tmp2.$$ echo Hello World! > $tmp2 -scc-make -f - <<'EOF' > $tmp1 +scc make -f - <<'EOF' > $tmp1 all: @echo Hello World! # blank line diff --git a/tests/make/execute/0044-macro.sh b/tests/make/execute/0044-macro.sh @@ -7,7 +7,7 @@ tmp2=tmp2.$$ echo Hello World! > $tmp2 -scc-make -f - <<'EOF' > $tmp1 2>&1 +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 @@ -9,7 +9,7 @@ cat > $tmp2 <<EOF make: error: don't know how to make target1 EOF -scc-make -f - target1 <<EOF > $tmp1 2>&1 +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 @@ -7,7 +7,7 @@ tmp2=tmp2.$$ echo Bye world! > $tmp2 -scc-make -f test.mk -f - hello <<EOF > $tmp1 2>&1 +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 @@ -7,7 +7,7 @@ tmp2=tmp2.$$ echo Hello World! > $tmp2 -scc-make -f- hello <<EOF > $tmp1 2>&1 +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 @@ -10,7 +10,7 @@ touch $tmp3 echo Hello World! > $tmp2 -scc-make -f- hello <<EOF > $tmp1 2>&1 +scc make -f- hello <<EOF > $tmp1 2>&1 FILE = test.mk F = $tmp3 diff --git a/tests/make/execute/0049-rule.sh b/tests/make/execute/0049-rule.sh @@ -10,7 +10,7 @@ Hello World! Bye World! EOF -scc-make -f- <<EOF > $tmp1 2>&1 +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 @@ -9,7 +9,7 @@ cat >$tmp2 <<EOF Hello World! Bye World! EOF -scc-make -f- <<EOF > $tmp1 2>&1 +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 @@ -8,7 +8,7 @@ tmp2=tmp2.$$ echo Hello World! > $tmp2 (set -e - scc-make -f- <<'EOF' + scc make -f- <<'EOF' .POSIX: all: diff --git a/tests/make/execute/0052-rule.sh b/tests/make/execute/0052-rule.sh @@ -12,7 +12,7 @@ fail EOF (set -e - scc-make -f- <<'EOF' + scc make -f- <<'EOF' .POSIX: all: diff --git a/tests/make/execute/0053-rule.sh b/tests/make/execute/0053-rule.sh @@ -12,7 +12,7 @@ fail EOF (set -e - scc-make -f- <<'EOF' + scc make -f- <<'EOF' .POSIX: .IGNORE: all diff --git a/tests/make/execute/0054-rule.sh b/tests/make/execute/0054-rule.sh @@ -12,7 +12,7 @@ fail EOF (set -e - scc-make -f- <<'EOF' + scc make -f- <<'EOF' .POSIX: .IGNORE: diff --git a/tests/make/execute/0055-rule.sh b/tests/make/execute/0055-rule.sh @@ -12,7 +12,7 @@ fail EOF (set -e - scc-make -if- <<'EOF' + scc make -if- <<'EOF' .POSIX: all: diff --git a/tests/make/execute/0056-rule.sh b/tests/make/execute/0056-rule.sh @@ -8,6 +8,6 @@ tmp2=tmp2.$$ echo Hello World! > $tmp2 echo 'all: ; @echo Hello World!' | -scc-make -f- > $tmp1 2>&1 +scc make -f- > $tmp1 2>&1 diff $tmp1 $tmp2 diff --git a/tests/make/execute/0057-default.sh b/tests/make/execute/0057-default.sh @@ -9,7 +9,7 @@ cat > $tmp2 <<'EOF' make: error: <stdin>:3: DEFAULT rule with prerequisites EOF -scc-make -f- <<EOF > $tmp1 2>&1 +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 @@ -7,7 +7,7 @@ tmp2=tmp2.$$ echo Hello World! > $tmp2 -scc-make -f- no-target <<EOF > $tmp1 2>&1 +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 @@ -7,7 +7,7 @@ tmp2=tmp2.$$ echo 'hola .' > $tmp2 -scc-make -f- <<'EOF' > $tmp1 2>&1 +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 @@ -7,7 +7,7 @@ tmp2=tmp2.$$ echo 'hola .' > $tmp2 -scc-make -f- <<'EOF' > $tmp1 2>&1 +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 @@ -7,7 +7,7 @@ tmp2=tmp2.$$ echo hello-hello > $tmp2 -scc-make -f- <<'EOF' > $tmp1 2>&1 +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 @@ -7,7 +7,7 @@ tmp2=tmp2.$$ echo Hello World!> $tmp2 -scc-make -f- all <<'EOF' > $tmp1 2>&1 +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 @@ -7,7 +7,7 @@ tmp2=tmp2.$$ echo Hello World!> $tmp2 -scc-make -f- all <<'EOF' > $tmp1 2>&1 +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 @@ -7,7 +7,7 @@ tmp2=tmp2.$$ echo Hello World!> $tmp2 -scc-make -f- all <<'EOF' > $tmp1 2>&1 +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 @@ -7,7 +7,7 @@ tmp2=tmp2.$$ echo Hello World!> $tmp2 -scc-make -f- all <<'EOF' > $tmp1 2>&1 +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 @@ -7,7 +7,7 @@ tmp2=tmp2.$$ echo Hello World!> $tmp2 -scc-make -f- all <<'EOF' > $tmp1 2>&1 +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 @@ -7,7 +7,7 @@ tmp2=tmp2.$$ echo Hello World! > $tmp2 -scc-make -f- <<'EOF' > $tmp1 2>&1 +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 @@ -7,7 +7,7 @@ tmp2=tmp2.$$ echo file1.o file2.o > $tmp2 -scc-make -f- <<'EOF' > $tmp1 2>&1 +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 @@ -7,7 +7,7 @@ tmp2=tmp2.$$ echo Hello World! > $tmp2 -scc-make -f- <<'EOF' > $tmp1 2>&1 +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 @@ -7,7 +7,7 @@ tmp2=tmp2.$$ echo Hello World! > $tmp2 -scc-make -f- <<'EOF' > $tmp1 2>&1 +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 @@ -7,7 +7,7 @@ tmp2=tmp2.$$ echo CC=pcc > $tmp2 -CC=dcc MAKEFLAGS='-S CC=gcc' scc-make -f- CC=pcc <<'EOF' > $tmp1 2>&1 +CC=dcc MAKEFLAGS='-S CC=gcc' 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 @@ -7,7 +7,7 @@ tmp2=tmp2.$$ echo CC=gcc > $tmp2 -CC=dcc MAKEFLAGS='-S CC=gcc' scc-make -f- <<'EOF' > $tmp1 2>&1 +CC=dcc MAKEFLAGS='-S CC=gcc' 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 @@ -7,7 +7,7 @@ tmp2=tmp2.$$ echo CC=tcc > $tmp2 -CC=dcc scc-make -f- <<'EOF' > $tmp1 2>&1 +CC=dcc 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 @@ -7,7 +7,7 @@ tmp2=tmp2.$$ echo CC=c99 > $tmp2 -CC=dcc scc-make -f- <<'EOF' > $tmp1 2>&1 +CC=dcc 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 @@ -7,7 +7,7 @@ tmp2=tmp2.$$ echo CC=dcc > $tmp2 -CC=dcc scc-make -ef- <<'EOF' > $tmp1 2>&1 +CC=dcc 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 @@ -7,7 +7,7 @@ tmp2=tmp2.$$ echo CC=pcc > $tmp2 -CC=dcc MAKEFLAGS='-S CC=gcc' scc-make -ef- CC=pcc <<'EOF' > $tmp1 2>&1 +CC=dcc MAKEFLAGS='-S CC=gcc' 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 @@ -6,7 +6,7 @@ tmp1=tmp1.$$ tmp2=tmp2.$$ echo SHELL=/bin/sh > $tmp2 -SHELL=foo scc-make -f- <<'EOF' +SHELL=foo scc make -f- <<'EOF' all: @echo $(SHELL) EOF diff --git a/tests/make/execute/0078-macro.sh b/tests/make/execute/0078-macro.sh @@ -6,7 +6,7 @@ tmp1=tmp1.$$ tmp2=tmp2.$$ echo SHELL=/bin/sh > $tmp2 -SHELL=foo scc-make -f- SHELL=/bin/sh <<'EOF' +SHELL=foo scc make -f- SHELL=/bin/sh <<'EOF' all: @echo $$SHELL EOF diff --git a/tests/make/execute/0079-macro.sh b/tests/make/execute/0079-macro.sh @@ -6,7 +6,7 @@ tmp1=tmp1.$$ tmp2=tmp2.$$ echo SHELL=/bin/sh > $tmp2 -SHELL=foo scc-make -f- <<'EOF' +SHELL=foo scc make -f- <<'EOF' SHELL = /bin/sh all: diff --git a/tests/make/execute/0080-rule.sh b/tests/make/execute/0080-rule.sh @@ -8,7 +8,7 @@ echo hello > $tmp echo hello > f.c -scc-make -sf- <<'EOF' +scc make -sf- <<'EOF' .c.o: cp $< $@ diff --git a/tests/make/execute/0081-rule.sh b/tests/make/execute/0081-rule.sh @@ -4,7 +4,7 @@ trap 'rm -f f.c f.o f' EXIT INT QUIT TERM HUP echo hello > f.c -scc-make -sf- <<'EOF' +scc make -sf- <<'EOF' .c: echo hello > $@ diff --git a/tests/make/execute/0082-rule.sh b/tests/make/execute/0082-rule.sh @@ -11,7 +11,7 @@ cat > $tmp2 <<EOF make: error: don't know how to make f EOF -scc-make -sf- <<'EOF' > $tmp1 2>&1 +scc make -sf- <<'EOF' > $tmp1 2>&1 .SUFFIXES: diff --git a/tests/make/execute/0083-rule.sh b/tests/make/execute/0083-rule.sh @@ -8,7 +8,7 @@ tmp2=tmp2.$$ echo dude > f.c echo hello > $tmp2 -(scc-make -f- <<'EOF' +(scc make -f- <<'EOF' f.o: @echo hello > $@ diff --git a/tests/make/execute/0084-rule.sh b/tests/make/execute/0084-rule.sh @@ -11,7 +11,7 @@ touch -t 200711121015 f1 f2 touch -t 200711121016 f touch -t 200711121017 f3 -(scc-make -f- > $tmp1 2>&1) <<'EOF' +(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 @@ -13,7 +13,7 @@ EOF echo Hello > t1.c -scc-make -f- <<'EOF' > $tmp1 2>&1 +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 @@ -11,7 +11,7 @@ touch t1 touch t2 EOF -scc-make -f- <<'EOF' > $tmp1 2>&1 +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 @@ -7,7 +7,7 @@ tmp2=tmp2.$$ echo '#error line' >$tmp2 -scc-make -f- <<'EOF' > $tmp1 2>&1 +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 @@ -10,7 +10,7 @@ Hello World! EOF -scc-make -f- <<'EOF' > $tmp1 2>&1 +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 @@ -9,7 +9,7 @@ cat >$tmp2 <<EOF Hello World! EOF -scc-make -f- <<'EOF' > $tmp1 2>&1 +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 @@ -9,7 +9,7 @@ cat >$tmp2 <<EOF Hello World! EOF -scc-make -f- <<'EOF' > $tmp1 2>&1 +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 @@ -10,7 +10,7 @@ But before! Hello World! EOF -scc-make -f- <<'EOF' > $tmp1 2>&1 +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 @@ -10,7 +10,7 @@ yeah! done EOF -scc-make -f- <<'EOF' > $tmp1 2>&1 +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 @@ -17,8 +17,8 @@ all: f.o EOF (touch f.c f.h -scc-make -f $tmp2 +scc make -f $tmp2 touch f.c -scc-make -f $tmp2) > $tmp3 +scc make -f $tmp2) > $tmp3 diff $tmp1 $tmp3 diff --git a/tests/make/execute/0094-expansion.sh b/tests/make/execute/0094-expansion.sh @@ -17,7 +17,7 @@ file1.c file2.c all EOF -scc-make -f- <<'EOF' > $tmp2 2>&1 +scc make -f- <<'EOF' > $tmp2 2>&1 O = o SRC = file1.c file2.c OBJ = $(SRC:.c=.$O) @@ -37,7 +37,7 @@ all: EOF diff $tmp1 $tmp2 -scc-make -f- <<'EOF' > $tmp2 2>&1 +scc make -f- <<'EOF' > $tmp2 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 @@ -9,7 +9,7 @@ cat > $tmp1 <<EOF Hello World! EOF -scc-make -f- MK=test.mk hello <<'EOF' > $tmp2 2>&1 +scc make -f- MK=test.mk hello <<'EOF' > $tmp2 2>&1 MK = fail.mk include $(MK) EOF diff --git a/tests/make/execute/0096-escape.sh b/tests/make/execute/0096-escape.sh @@ -10,7 +10,7 @@ MACRO=hello EOF -scc-make -f- <<'EOF' > $tmp2 2>&1 +scc make -f- <<'EOF' > $tmp2 2>&1 MACRO = $$(echo hello) all: diff --git a/tests/make/execute/Makefile b/tests/make/execute/Makefile @@ -1,9 +1,9 @@ .POSIX: -ROOT=../../.. +BINDIR = ../../../bin/ all: - @PATH=$(ROOT)/bin:$$PATH ./chktest.sh + PATH=$(BINDIR):$$PATH ./chktest.sh tests: @$(MAKE) |\