Fix "make clean" for sim subdir

msinger · Feb 21, 2021 · 0d59062 · 0d59062
1 parent b3a7b45
commit 0d59062
Show file tree

Hide file tree

Showing 10 changed files with 9 additions and 18 deletions.
diff --git a/sim/Makefile.am b/sim/Makefile.am
@@ -12,7 +12,9 @@ $(nodist_sm83_sim_SOURCES)
 
 CLEANFILES = \
 $(nodist_sm83_sim_SOURCES) \
-sm83_sim_design.h
+sm83_sim_design.h \
+$(patsubst %.sh,sm83_sim_%.mem,$(notdir $(SM83_TESTS))) \
+$(patsubst %.sh,sm83_sim_%.out,$(notdir $(SM83_TESTS)))
 
 SM83_UUT = \
 cpu/sm83.sv \
@@ -26,7 +28,7 @@ cpu/sm83_alu_control.sv \
 cpu/sm83_alu_flags.sv \
 cpu/sm83_int.sv
 
-TESTS = \
+SM83_TESTS = \
 test/sm83/ld8.sh \
 test/sm83/ld16.sh \
 test/sm83/add8.sh \
@@ -36,6 +38,9 @@ test/sm83/bit.sh \
 test/sm83/jp.sh \
 test/sm83/call.sh
 
+TESTS = \
+$(SM83_TESTS)
+
 TEST_EXTENSIONS = .sh
 SH_LOG_COMPILER = $(SH)
 AM_SH_LOG_FLAGS =

diff --git a/sim/test/sm83/add16.sh b/sim/test/sm83/add16.sh
@@ -10,8 +10,6 @@
 
 set -e
 
-TEST=sm83_sim_add16
-
 simulate 220 <<"EOF"
 # @tick #0
 # Preset registers with values

diff --git a/sim/test/sm83/add8.sh b/sim/test/sm83/add8.sh
@@ -18,8 +18,6 @@
 
 set -e
 
-TEST=sm83_sim_add8
-
 simulate 320 <<"EOF"
 # @tick #0
 # Preset registers with values

diff --git a/sim/test/sm83/bit.sh b/sim/test/sm83/bit.sh
@@ -9,8 +9,6 @@
 
 set -e
 
-TEST=sm83_sim_bit
-
 simulate 216 <<"EOF"
 # @tick #0
 # Preset registers and memory with values

diff --git a/sim/test/sm83/call.sh b/sim/test/sm83/call.sh
@@ -12,8 +12,6 @@
 
 set -e
 
-TEST=sm83_sim_call
-
 simulate 388 <<"EOF"
 # @tick #0
 # Preset register AF and SP

diff --git a/sim/test/sm83/functions b/sim/test/sm83/functions
@@ -1,3 +1,5 @@
+TEST=sm83_sim_$(basename -s.sh $0)
+
 function drop_comments () {
 	while read -r line; do
 		if [[ "$line" == "#"* ]]; then

diff --git a/sim/test/sm83/jp.sh b/sim/test/sm83/jp.sh
@@ -11,8 +11,6 @@
 
 set -e
 
-TEST=sm83_sim_jp
-
 simulate 204 <<"EOF"
 # @tick #0
 # Preset register HL and AF

diff --git a/sim/test/sm83/ld16.sh b/sim/test/sm83/ld16.sh
@@ -12,8 +12,6 @@
 
 set -e
 
-TEST=sm83_sim_ld16
-
 simulate 288 <<"EOF"
 # @tick #0
 # Set flags

diff --git a/sim/test/sm83/ld8.sh b/sim/test/sm83/ld8.sh
@@ -25,8 +25,6 @@
 
 set -e
 
-TEST=sm83_sim_ld8
-
 simulate 404 <<"EOF"
 # @tick #0
 # Set flags

diff --git a/sim/test/sm83/rot.sh b/sim/test/sm83/rot.sh
@@ -18,8 +18,6 @@
 
 set -e
 
-TEST=sm83_sim_rot
-
 simulate 212 <<"EOF"
 # @tick #0
 # Preset registers and memory with values