test setup: avoid _specification, ignored by dune

spectec/Makefile

@@ -72,15 +72,9 @@ doc/example: exe
 	@(cd $@ && make out clean >$(LOG) 2>&1 && rm -f $(LOG))
 
 
-# Specification (copy to local workspace to make dune deps for tests happy)
+# Specification
 
 SPECIFICATIONDIR = $(ROOTDIR)/specification
-SPECCLONEDIR = _specification
-
-$(SPECCLONEDIR): $(shell find $(SPECIFICATIONDIR) -type f)
-	rm -rf $(SPECCLONEDIR)
-	cp -R $(SPECIFICATIONDIR) $(SPECCLONEDIR)
-
 
 # Spec document
 

spectec/specification

@@ -0,0 +1 @@
+../specification/

spectec/src/exe-spectec/dune

@@ -1,4 +1,4 @@
 (executable
   (name main)
   (libraries spectec)
-)
+)

spectec/test-frontend/Makefile

@@ -7,7 +7,6 @@ LOG = _log
 
 OWNDIR = $(PWD)
 SPECDIR = ../../specification
-SPECCLONE = ../_specification
 SPECFILES = $(shell cd $(SPECDIR) && ls -d wasm-*)
 TESTFILES = $(shell ls *.$(EXT))
 SPECS = $(SPECFILES:%=test-%)
@@ -28,8 +27,8 @@ all: test
 
 test: $(SPECS) $(TESTS)
 
-$(SPECS): test-%: $(SPECCLONE) $(EXE)
-	(cd $(SPECCLONE)/$* && $(EXE) -l *.$(EXT))
+$(SPECS): test-%: $(SPECDIR) $(EXE)
+	(cd $(SPECDIR)/$* && $(EXE) -l *.$(EXT))
 
 $(TESTS): test-%: %.$(EXT) $(EXE)
 	($(EXE) -l $<)
@@ -43,12 +42,6 @@ exe:
 	@(cd ..; make exe)
 
 
-# Specification
-
-$(SPECCLONE): $(SPECDEPFILES)
-	@(cd ..; make _specification)
-
-
 # Cleanup
 
 .PHONY: clean distclean

spectec/test-frontend/dune

@@ -2,7 +2,7 @@
   (libraries spectec)
   (deps
     (file ../src/exe-spectec/main.exe)
-    (glob_files_rec ../_specification/*)
+    (glob_files ../specification/wasm-3.0/*)
     (file test.spectec)
   )
   (files TEST.md)

spectec/test-interpreter/Makefile

@@ -7,7 +7,6 @@ LOG = _log
 
 OWNDIR = $(PWD)
 SPECDIR = ../../specification/wasm-3.0
-SPECCLONE = ../_specification/wasm-3.0
 SPECFILES = $(shell ls $(SPECDIR)/*.$(EXT))
 
 
@@ -22,8 +21,8 @@ all: test
 
 .PHONY: test
 
-test: $(SPECCLONE) $(EXE)
-	(cd $(SPECCLONE) && $(EXE) -l *.$(EXT))
+test: $(SPECDIR) $(EXE)
+	(cd $(SPECDIR) && $(EXE) -l *.$(EXT))
 
 
 # Executable
@@ -34,12 +33,6 @@ exe:
 	@(cd ..; make exe)
 
 
-# Specification
-
-$(SPECCLONE): $(SPECFILES)
-	@(cd ..; make _specification)
-
-
 # Cleanup
 
 .PHONY: clean distclean

spectec/test-interpreter/TEST.md

@@ -1,7 +1,7 @@
 # Preview
 
 ```sh
-$ ../src/exe-spectec/main.exe ../../../_specification/wasm-3.0/*.spectec -v -l --interpreter ../test-interpreter/sample.wat addTwo 30 12 2>&1
+$ ../src/exe-spectec/main.exe ../../../specification/wasm-3.0/*.spectec -v -l --interpreter ../test-interpreter/sample.wat addTwo 30 12 2>&1
 spectec 0.5 generator
 == Parsing...
 == Elaboration...
@@ -14,7 +14,7 @@ spectec 0.5 generator
 ===== ../test-interpreter/sample.wat =====
 42
 == Complete.
-$ ../src/exe-spectec/main.exe ../../../_specification/wasm-3.0/*.spectec -v -l --interpreter ../test-interpreter/sample.wasm addTwo 40 2 2>&1
+$ ../src/exe-spectec/main.exe ../../../specification/wasm-3.0/*.spectec -v -l --interpreter ../test-interpreter/sample.wasm addTwo 40 2 2>&1
 spectec 0.5 generator
 == Parsing...
 == Elaboration...
@@ -27,7 +27,7 @@ spectec 0.5 generator
 ===== ../test-interpreter/sample.wasm =====
 42
 == Complete.
-$ ../src/exe-spectec/main.exe ../../../_specification/wasm-3.0/*.spectec -v -l --interpreter ../test-interpreter/sample.wast 2>&1
+$ ../src/exe-spectec/main.exe ../../../specification/wasm-3.0/*.spectec -v -l --interpreter ../test-interpreter/sample.wast 2>&1
 spectec 0.5 generator
 == Parsing...
 == Elaboration...
@@ -44,7 +44,7 @@ spectec 0.5 generator
 == Complete.
 $ for v in 1 2 3; do ( \
 >   echo "Running test for Wasm $v.0..." && \
->   ../src/exe-spectec/main.exe ../../../_specification/wasm-$v.0/*.spectec -v -l --test-version $v --interpreter ../test-interpreter/spec-test-$v \
+>   ../src/exe-spectec/main.exe ../../../specification/wasm-$v.0/*.spectec -v -l --test-version $v --interpreter ../test-interpreter/spec-test-$v \
 > ) done 2>&1
 Running test for Wasm 1.0...
 spectec 0.5 generator

spectec/test-interpreter/dune

@@ -2,7 +2,9 @@
   (libraries spectec)
   (deps
     (file ../src/exe-spectec/main.exe)
-    (glob_files_rec ../_specification/*)
+    (glob_files ../specification/wasm-1.0/*)
+    (glob_files ../specification/wasm-2.0/*)
+    (glob_files ../specification/wasm-3.0/*)
     (source_tree spec-test-1)
     (source_tree spec-test-2)
     (source_tree spec-test-3)

spectec/test-latex/Makefile

@@ -7,7 +7,6 @@ LOG = _log
 
 OWNDIR = $(PWD)
 SPECDIR = ../../specification
-SPECCLONE = ../_specification
 SPECS = $(shell cd $(SPECDIR) && ls -d wasm-*)
 SPECFILES = $(shell ls $(SPECS:%=$(SPECDIR)/%/*.$(EXT)))
 TESTFILES = $(shell ls *.$(EXT))
@@ -40,8 +39,8 @@ gen: $(SPECS:%=$(GENINNAME)-%.tex)
 
 test-gen: $(SPECS:%=$(GENOUTNAME)-%.pdf) test-test
 
-$(GENINNAME)-%.tex: $(SPECCLONE) $(EXE)
-	(cd $(SPECCLONE)/$* && $(EXE) -l --latex *.$(EXT) -o $(OWNDIR)/$@)
+$(GENINNAME)-%.tex: $(EXE)
+	(cd $(SPECDIR)/$* && $(EXE) -l --latex *.$(EXT) -o $(OWNDIR)/$@)
 
 $(GENOUTNAME)-%.tex: $(GENOUTNAME).tex
 	ln -f $< $@
@@ -71,12 +70,6 @@ exe:
 	@(cd ..; make exe)
 
 
-# Specification
-
-$(SPECCLONE): $(SPECFILES)
-	@(cd ..; make _specification)
-
-
 # Cleanup
 
 .PHONY: clean distclean

spectec/test-latex/dune

@@ -2,7 +2,7 @@
   (libraries spectec)
   (deps
     (file ../src/exe-spectec/main.exe)
-    (glob_files_rec ../_specification/*)
+    (glob_files ../specification/wasm-3.0/*)
     (file test.spectec)
   )
   (files TEST.md)