about summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rwxr-xr-xsubx/run_one_test.sh16
1 files changed, 6 insertions, 10 deletions
diff --git a/subx/run_one_test.sh b/subx/run_one_test.sh
index 7ac3e5d0..caecd63c 100755
--- a/subx/run_one_test.sh
+++ b/subx/run_one_test.sh
@@ -4,9 +4,10 @@
 
 if [[ $2 == 'test-'* ]]
 then
-  export TEST_NAME=$2
-  echo $TEST_NAME > /tmp/last_test_run
-elif [[ -e /tmp/last_test_run ]]
+  TEST_NAME=$2 envsubst '$TEST_NAME' < run_one_test.subx > /tmp/run_one_test.subx
+  FILES=$(ls [0-9]*.subx apps/subx-common.subx $1 |sort |uniq)
+  echo $FILES > /tmp/last_run_files
+elif [[ -e /tmp/last_run_files ]]
 then
   FILES=`cat /tmp/last_run_files`
 else
@@ -15,12 +16,7 @@ else
 fi
 
 set -e
-if [[ $1 == */* ]]
-then
-  CFLAGS=$CFLAGS ./subx --debug translate [0-9]*.subx  apps/subx-common.subx $1 /tmp/run_one_test.subx -o /tmp/a.elf
-else
-  # don't mention files twice
-  CFLAGS=$CFLAGS ./subx --debug translate [0-9]*.subx apps/subx-common.subx    /tmp/run_one_test.subx -o /tmp/a.elf
-fi
+                                      # turn newlines into spaces
+CFLAGS=$CFLAGS ./subx --debug translate $(echo $FILES) /tmp/run_one_test.subx -o /tmp/a.elf
 
 ./subx --debug --trace run /tmp/a.elf
title='Blame the previous revision' href='/akkartik/mu/blame/subx/014index_addressing.cc?h=hlt&id=0c6c7ff7142cb10532da21fb423f4d04efecf6c2'>^
0c6c7ff7 ^

631de5d9 ^


222c31db ^

bb62d65e ^


c442a5ad ^
bb62d65e ^


1a62e61d ^
c442a5ad ^
f7ff8585 ^
222c31db ^
836d13db ^

c442a5ad ^
836d13db ^

222c31db ^
bb62d65e ^
c442a5ad ^
836d13db ^
bb62d65e ^
631de5d9 ^
836d13db ^
4a943d4e ^





83c67014 ^
4a943d4e ^



83c67014 ^
4a943d4e ^








0e87e934 ^
4a943d4e ^



83c67014 ^
4a943d4e ^



83c67014 ^
4a943d4e ^








d1df4aca ^


4a943d4e ^





83c67014 ^
4a943d4e ^



83c67014 ^
4a943d4e ^









d1df4aca ^







4a943d4e ^





83c67014 ^
4a943d4e ^



83c67014 ^
4a943d4e ^









d1df4aca ^




1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155