tests: Make with central config.mk

Author: thaliaarchi

.gitignore

@@ -1,2 +1,3 @@
 /target
+/tests/config.mk
 *.png

tests/Makefile

@@ -0,0 +1,16 @@
+SUBDIRS := burghard censoredusername palaiologos voliva wconrad wsf \
+	third_party/palaiologos third_party/voliva third_party/wconrad
+
+.PHONY: all clean
+all: $(SUBDIRS:%=%.all)
+clean: $(SUBDIRS:%=%.clean)
+
+.PHONY: %.all
+%.all:
+	@echo make -C $* all
+	@$(MAKE) -C $* all
+
+.PHONY: %.clean
+%.clean:
+	@echo make -C $* clean
+	@$(MAKE) -C $* clean

tests/burghard/Makefile

@@ -1,4 +1,5 @@
-WSA = $(error 'Specify $$WSA')
+-include ../config.mk
+-include ../config.tmpl.mk
 
 PASS = $(shell find pass -name '*.wsa')
 FAIL = $(shell find fail -name '*.wsa')
@@ -9,10 +10,10 @@ ERR = $(FAIL:.wsa=.err)
 all: $(WS) $(ERR)
 
 %.ws: %.wsa
-	$(WSA) --ext-syntax --ended $< > $@
+	$(BURGHARD_WSA) --ext-syntax --ended $< > $@
 
 %.err: %.wsa
-	! $(WSA) --ext-syntax --ended $< 2> $@
+	! $(BURGHARD_WSA) --ext-syntax --ended $< 2> $@
 
 .PHONY: clean
 clean:

tests/censoredusername/Makefile

@@ -1,4 +1,5 @@
-WSC = $(error 'Specify $$WSC')
+-include ../config.mk
+-include ../config.tmpl.mk
 
 PASS = $(shell find pass -name '*.wsa')
 FAIL = $(shell find fail -name '*.wsa')
@@ -9,11 +10,11 @@ ERR = $(FAIL:.wsa=.err)
 all: $(WS) $(ERR)
 
 %.ws: %.wsa
-	$(WSC) -t -f asm -o $@ $<
+	$(CENSOREDUSERNAME_WSC) -t -f asm -o $@ $<
 
 # Test for empty stdout, since wsc always exits with 0 unless it panics.
 %.err: %.wsa
-	! $(WSC) -t -f asm $< 2> $@ > $<.out || ! test -s $<.out && rm $<.out
+	! $(CENSOREDUSERNAME_WSC) -t -f asm $< 2> $@ > $<.out || ! test -s $<.out && rm $<.out
 
 .PHONY: all
 clean:

tests/config.tmpl.mk

@@ -0,0 +1,16 @@
+# Copy this template to config.mk to configure paths to each of these
+# assemblers.
+
+BURGHARD_WSA ?= $(error 'Configure $$BURGHARD_WSA in config.mk')
+CENSOREDUSERNAME_WSC ?= $(error 'Configure $$CENSOREDUSERNAME_WSC in config.mk')
+PALAIOLOGOS_WSI ?= $(error 'Configure $$PALAIOLOGOS_WSI in config.mk')
+VOLIVA_WSA_DIR ?= $(error 'Configure $$VOLIVA_WSA_DIR in config.mk')
+VOLIVA_CLI ?= $(VOLIVA_WSA_DIR)/dist/cli.js
+WCONRAD_ASM ?= $(error 'Configure $$WCONRAD_ASM in config.mk')
+WSF_ASSEMBLE ?= $(error 'Configure $$WSF_ASSEMBLE in config.mk')
+WSC_WSF ?= $(error 'Configure $$WSC_WSF in config.mk')
+
+NODE ?= node
+RUBY ?= ruby
+
+TIMEOUT_SECS ?= 1

tests/palaiologos/Makefile

@@ -1,4 +1,5 @@
-WSI = $(error 'Specify $$WSI')
+-include ../config.mk
+-include ../config.tmpl.mk
 
 PASS = $(shell find pass -name '*.asm' -o -name '*.bak')
 FAIL = $(shell find fail -name '*.asm' -o -name '*.bak')
@@ -11,19 +12,19 @@ TIMEOUT = $(patsubst %.asm, %.timeout, $(patsubst %.bak, %.timeout, $(TIMEOUT_AS
 all: $(WS) $(ERR) $(TIMEOUT)
 
 %.ws: %.asm
-	$(WSI) --masm $< > $@
+	$(PALAIOLOGOS_WSI) --masm $< > $@
 %.ws: %.bak
-	$(WSI) --masm $< > $@
+	$(PALAIOLOGOS_WSI) --masm $< > $@
 
 %.err: %.asm
-	! $(WSI) --masm $< 2> $@
+	! $(PALAIOLOGOS_WSI) --masm $< 2> $@
 %.err: %.bak
-	! $(WSI) --masm $< 2> $@
+	! $(PALAIOLOGOS_WSI) --masm $< 2> $@
 
 %.timeout: %.asm
-	! timeout 2 $(WSI) --masm $< >/dev/null && touch $@
+	! timeout $(TIMEOUT_SECS) $(PALAIOLOGOS_WSI) --masm $< >/dev/null && touch $@
 %.timeout: %.bak
-	! timeout 2 $(WSI) --masm $< >/dev/null && touch $@
+	! timeout $(TIMEOUT_SECS) $(PALAIOLOGOS_WSI) --masm $< >/dev/null && touch $@
 
 .PHONY: clean
 clean:

tests/third_party/palaiologos/Makefile

@@ -1,4 +1,5 @@
-WSI = $(error 'Specify $$WSI')
+-include ../../config.mk
+-include ../../config.tmpl.mk
 
 ASM = $(shell find . -name '*.asm' -o -name '*.bak')
 WS = $(patsubst %.asm, %.ws, $(patsubst %.bak, %.ws, $(ASM)))
@@ -7,9 +8,9 @@ WS = $(patsubst %.asm, %.ws, $(patsubst %.bak, %.ws, $(ASM)))
 all: $(WS)
 
 %.ws: %.asm
-	$(WSI) --masm $< > $@
+	$(PALAIOLOGOS_WSI) --masm $< > $@
 %.ws: %.bak
-	$(WSI) --masm $< > $@
+	$(PALAIOLOGOS_WSI) --masm $< > $@
 
 .PHONY: clean
 clean:

tests/third_party/voliva/Makefile

@@ -1,6 +1,5 @@
-NODE = node
-WSA_DIR = $(error 'Specify $$WSA_DIR')
-CLI = $(WSA_DIR)/dist/cli.js
+-include ../../config.mk
+-include ../../config.tmpl.mk
 
 PASS = $(filter-out $(FAIL), $(shell find . -name '*.wsa'))
 FAIL =
@@ -11,14 +10,14 @@ ERR = $(FAIL:.wsa=.err)
 all: $(WS) $(ERR)
 
 %.extensions.ws: %.extensions.wsa
-	$(NODE) $(CLI) compile --extensions $< $@
+	$(NODE) $(VOLIVA_CLI) compile --extensions $< $@
 
 %.ws: %.wsa
-	$(NODE) $(CLI) compile $< $@
+	$(NODE) $(VOLIVA_CLI) compile $< $@
 
 %.err: %.wsa
-	! $(NODE) $(CLI) compile $< $(<:.wsa=.ws) 2> $@ >&2
-	@sed -i.bak "s|$$(realpath $(WSA_DIR))|"'$$WSA|' $@
+	! $(NODE) $(VOLIVA_CLI) compile $< $(<:.wsa=.ws) 2> $@ >&2
+	@sed -i.bak "s|$$(realpath $(VOLIVA_WSA_DIR))|"'$$WSA|' $@
 	@rm $@.bak
 
 .PHONY: clean

tests/third_party/wconrad/Makefile

@@ -1,5 +1,5 @@
-RUBY = ruby
-ASM = $(error 'Specify $$ASM')
+-include ../../config.mk
+-include ../../config.tmpl.mk
 
 WSA = $(shell find . -name '*.wsa')
 WS = $(WSA:.wsa=.ws)
@@ -8,7 +8,7 @@ WS = $(WSA:.wsa=.ws)
 all: $(WS)
 
 %.ws: %.wsa
-	$(RUBY) $(ASM) $<
+	$(RUBY) $(WCONRAD_ASM) $<
 
 .PHONY: clean
 clean:

tests/voliva/Makefile

@@ -1,6 +1,5 @@
-NODE = node
-WSA_DIR = $(error 'Specify $$WSA_DIR')
-CLI = $(WSA_DIR)/dist/cli.js
+-include ../config.mk
+-include ../config.tmpl.mk
 
 PASS = $(shell find pass -name '*.wsa')
 FAIL = $(shell find fail -name '*.wsa')
@@ -11,11 +10,11 @@ ERR = $(FAIL:.wsa=.err)
 all: $(WS) $(ERR)
 
 %.ws: %.wsa
-	$(NODE) $(CLI) compile --extensions $< $@
+	$(NODE) $(VOLIVA_CLI) compile --extensions $< $@
 
 %.err: %.wsa
-	! $(NODE) $(CLI) compile --extensions $< $(<:.wsa=.ws) 2> $@ >&2
-	@sed -i.bak "s|$$(realpath $(WSA_DIR))|"'$$WSA|' $@
+	! $(NODE) $(VOLIVA_CLI) compile --extensions $< $(<:.wsa=.ws) 2> $@ >&2
+	@sed -i.bak "s|$$(realpath $(VOLIVA_WSA_DIR))|"'$$WSA|' $@
 	@rm $@.bak
 
 .PHONY: clean

tests/wconrad/Makefile

@@ -1,5 +1,5 @@
-RUBY = ruby
-ASM = $(error 'Specify $$ASM')
+-include ../config.mk
+-include ../config.tmpl.mk
 
 WSA = $(shell find . -name '*.wsa')
 WS = $(WSA:.wsa=.ws)
@@ -8,7 +8,7 @@ WS = $(WSA:.wsa=.ws)
 all: $(WS)
 
 %.ws: %.wsa
-	$(RUBY) $(ASM) $<
+	$(RUBY) $(WCONRAD_ASM) $<
 
 .PHONY: clean
 clean:

tests/wsf/Makefile

@@ -1,5 +1,5 @@
-WSF = wsf-assemble
-WSC = wsc-fork
+-include ../config.mk
+-include ../config.tmpl.mk
 
 PASS = $(shell find pass -name '*.wsf')
 FAIL = $(shell find fail -name '*.wsf')
@@ -11,13 +11,13 @@ ERR = $(FAIL:.wsf=.err)
 all: $(WSA) $(WS) $(ERR)
 
 %.wsa: %.wsf
-	$(WSF) $< $@
+	$(WSF_ASSEMBLE) $< $@
 
 %.ws: %.wsa
-	$(WSC) -t -f asm -o $@ $<
+	$(WSF_WSC) -t -f asm -o $@ $<
 
 %.err: %.wsa
-	! $(WSC) -t -f asm $< 2> $@
+	! $(WSF_WSC) -t -f asm $< 2> $@
 
 fail/hash_in_import.wsa fail/hash_in_export.wsa: fail/path\#with_hash.wsf