commit a12330ef03ccad16f2356827fd15e87fd55afa89
parent c976ebaa3bd1bfe38ed7c7871b1d37e94a856345
Author: Roberto E. Vargas Caballero <k0ga@shike2.com>
Date: Tue, 12 Nov 2024 22:30:49 +0100
tests/nm: Use new scc wrapper in the tests
This make easier to use scc-nm from other directories.
Diffstat:
14 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/tests/nm/execute/0001-z80.sh b/tests/nm/execute/0001-z80.sh
@@ -6,7 +6,7 @@ tmp1=`mktemp`
tmp2=`mktemp`
trap "rm -f $tmp1 $tmp2; exit" 0 2 3
-scc-nm z80.out > $tmp1
+scc nm z80.out > $tmp1
cat <<! > $tmp2
0000000000000000 b .bss
diff --git a/tests/nm/execute/0002-z80-u.sh b/tests/nm/execute/0002-z80-u.sh
@@ -6,7 +6,7 @@ tmp1=`mktemp`
tmp2=`mktemp`
trap "rm -f $tmp1 $tmp2; exit" 0 2 3
-scc-nm -u z80.out > $tmp1
+scc nm -u z80.out > $tmp1
cat <<! > $tmp2
U text6
diff --git a/tests/nm/execute/0003-z80-g.sh b/tests/nm/execute/0003-z80-g.sh
@@ -6,7 +6,7 @@ tmp1=`mktemp`
tmp2=`mktemp`
trap "rm -f $tmp1 $tmp2; exit" 0 2 3
-scc-nm -g z80.out > $tmp1
+scc nm -g z80.out > $tmp1
cat <<! > $tmp2
0000000000000001 B averylongbss
diff --git a/tests/nm/execute/0004-z80-v.sh b/tests/nm/execute/0004-z80-v.sh
@@ -6,7 +6,7 @@ tmp1=`mktemp`
tmp2=`mktemp`
trap "rm -f $tmp1 $tmp2; exit" 0 2 3
-scc-nm -v z80.out > $tmp1
+scc nm -v z80.out > $tmp1
cat <<! > $tmp2
U text6
diff --git a/tests/nm/execute/0005-z80-A.sh b/tests/nm/execute/0005-z80-A.sh
@@ -10,7 +10,7 @@ rm -f f.a
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
+scc nm -A f.a z80.out > $tmp1
cat <<! > $tmp2
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
@@ -6,7 +6,7 @@ tmp1=`mktemp`
tmp2=`mktemp`
trap "rm -f $tmp1 $tmp2; exit" 0 2 3
-scc-nm -t o z80.out > $tmp1
+scc nm -t o z80.out > $tmp1
cat <<! > $tmp2
0000000000000000 b .bss
diff --git a/tests/nm/execute/0007-z80-d.sh b/tests/nm/execute/0007-z80-d.sh
@@ -6,7 +6,7 @@ tmp1=`mktemp`
tmp2=`mktemp`
trap "rm -f $tmp1 $tmp2; exit" 0 2 3
-scc-nm -t d z80.out > $tmp1
+scc nm -t d z80.out > $tmp1
cat <<! > $tmp2
0000000000000000 b .bss
diff --git a/tests/nm/execute/0008-z80-x.sh b/tests/nm/execute/0008-z80-x.sh
@@ -6,7 +6,7 @@ tmp1=`mktemp`
tmp2=`mktemp`
trap "rm -f $tmp1 $tmp2; exit" 0 2 3
-scc-nm -t x z80.out > $tmp1
+scc nm -t x z80.out > $tmp1
cat <<! > $tmp2
0000000000000000 b .bss
diff --git a/tests/nm/execute/0009-z80-P-o.sh b/tests/nm/execute/0009-z80-P-o.sh
@@ -6,7 +6,7 @@ tmp1=`mktemp`
tmp2=`mktemp`
trap "rm -f $tmp1 $tmp2; exit" 0 2 3
-scc-nm -P -t o z80.out > $tmp1
+scc nm -P -t o z80.out > $tmp1
cat <<! > $tmp2
.bss b 0000000000000000 0
diff --git a/tests/nm/execute/0010-z80-P-d.sh b/tests/nm/execute/0010-z80-P-d.sh
@@ -6,7 +6,7 @@ tmp1=`mktemp`
tmp2=`mktemp`
trap "rm -f $tmp1 $tmp2; exit" 0 2 3
-scc-nm -P -t x z80.out > $tmp1
+scc nm -P -t x z80.out > $tmp1
cat <<! > $tmp2
.bss b 0000000000000000 0
diff --git a/tests/nm/execute/0011-z80-P-x.sh b/tests/nm/execute/0011-z80-P-x.sh
@@ -6,7 +6,7 @@ tmp1=`mktemp`
tmp2=`mktemp`
trap "rm -f $tmp1 $tmp2; exit" 0 2 3
-scc-nm -P -t x z80.out > $tmp1
+scc nm -P -t x z80.out > $tmp1
cat <<! > $tmp2
.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 @@ tmp1=`mktemp`
tmp2=`mktemp`
trap "rm -f $tmp1 $tmp2; exit" 0 2 3
-scc-nm -f z80.out > $tmp1
+scc nm -f z80.out > $tmp1
cat <<! > $tmp2
0000000000000000 b .bss
diff --git a/tests/nm/execute/0013-z80-a.sh b/tests/nm/execute/0013-z80-a.sh
@@ -6,7 +6,7 @@ tmp1=`mktemp`
tmp2=`mktemp`
trap "rm -f $tmp1 $tmp2; exit" 0 2 3
-scc-nm -a z80.out > $tmp1
+scc nm -a z80.out > $tmp1
cat <<! > $tmp2
0000000000000000 b .bss
diff --git a/tests/nm/execute/Makefile b/tests/nm/execute/Makefile
@@ -1,12 +1,12 @@
.POSIX:
-ROOT=../../..
+BINDIR = ../../../bin/
OUT = z80.out
AS = z80-unknown-coff-as
all: $(OUT)
- @PATH=$(ROOT)/bin:$$PATH:. chktest.sh
+ PATH=$(BINDIR):$$PATH ./chktest.sh
tests:
@if command -v $(AS) >/dev/null;\