History

Allow parallel build testsuite

herman ten brugge committed 3 years ago

Commit 7ed9c951 parent d1fa89a1 file · +5 −5Browse files

Unified · Split

tests/tests2/Makefile+5−5
@@ -102,8 +102,8 @@ GEN-ALWAYS = · 101 unmodified lines
102102 113_btdll.test: T1 = \
103103 $(TCC) -bt $1 -shared -D DLL=1 -o a1$(DLLSUF) && \
104104 $(TCC) -bt $1 -shared -D DLL=2 -o a2$(DLLSUF) && \
105− $(TCC) -bt $1 a1$(DLLSUF) a2$(DLLSUF) -Wl,-rpath=. -o a.exe && \
106− ./a.exe
105+ $(TCC) -bt $1 a1$(DLLSUF) a2$(DLLSUF) -Wl,-rpath=. -o $(basename $@).exe && \
106+ ./$(basename $@).exe
107107
108108 114_bound_signal.test: FLAGS += -b
109109 114_bound_signal.test: NORUN = true # tcc -run does not support fork and -b and SELINUX
@@ -131,7 +131,7 @@ all test tests2.all: $(filter-out $(SKIP),$(TESTS)) · 21 unmodified lines
131131 @$(call T1,$<) $(T3)
132132
133133 T1 = $(TCC) $(FLAGS) $(T2) $(ARGS)
134−T2 = $(if $(NORUN),$1 -o a.exe && ./a.exe,-run $1)
134+T2 = $(if $(NORUN),$1 -o $(basename $@).exe && ./$(basename $@).exe,-run $1)
135135 T3 = $(FILTER) >$*.output 2>&1 || true \
136136 && diff -Nbu $(filter %.expect,$^) $*.output \
137137 && rm -f $*.output $(filter $*.expect,$(GEN-ALWAYS))
@@ -159,7 +159,7 @@ F2 = $1 UPDATE="$(patsubst %.test,%.expect,$1)" · 21 unmodified lines
159159
160160 # using TCC for .expect if -dt in FLAGS
161161 GEN = $(if $(filter -dt -bt -b,$(FLAGS)),$(GEN-TCC),$(GEN-CC))
162−GEN-CC = $(CC) -w -std=gnu99 $(FLAGS) $1 -o a.exe && ./a.exe $(ARGS)
162+GEN-CC = $(CC) -w -std=gnu99 $(FLAGS) $1 -o $(basename $@).exe && ./$(basename $@).exe $(ARGS)
163163 GEN-TCC = $(T1)
164164 GEN-MSC = $(MS-CC) $1 && ./$(basename $@).exe
165165 MS-CC = cl
@@ -172,4 +172,4 @@ $(sort $(GEN-ALWAYS) $(UPDATE)) : force · 6 unmodified lines
172172 force:
173173
174174 clean :
175− rm -f fred.txt *.output a.exe *.dll *.so *.def $(GEN-ALWAYS)
175+ rm -f fred.txt *.output *.exe *.dll *.so *.def $(GEN-ALWAYS)

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t