From 136eb1b4076f5ed3f34af66f64c410572ef7fb6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ole=20Kr=C3=BCger?= Date: Tue, 17 May 2022 11:05:06 +0100 Subject: [PATCH 1/7] [interpreter] Ignore warnings generated by missing interface files --- interpreter/dune | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/interpreter/dune b/interpreter/dune index 2b5cd3572d..285db84970 100644 --- a/interpreter/dune +++ b/interpreter/dune @@ -28,6 +28,6 @@ (modules parser))) (env - (dev + (_ (flags - (-w +a-4-27-42-44-45 -warn-error +a-3)))) + (-w +a-4-27-42-44-45-70 -warn-error +a-3)))) From 3b43ca93aa51a4ed8b7d875a394b3ad01f58036a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ole=20Kr=C3=BCger?= Date: Tue, 17 May 2022 11:11:37 +0100 Subject: [PATCH 2/7] [interpreter] Exclude 'smallint' test module from interpreter Dune library --- interpreter/dune | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/interpreter/dune b/interpreter/dune index 285db84970..6601d62518 100644 --- a/interpreter/dune +++ b/interpreter/dune @@ -6,7 +6,8 @@ ; WASM REPL every time in all the dependencies. ; We also need to exclude the 'wasm' module as it overlaps with the library ; name. - (modules :standard \ main wasm)) + ; 'smallint' is a separate test module. + (modules :standard \ main wasm smallint)) (executable (name main) From fcb5d07e8ab93948c9a3279e0fffa74b928acd1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ole=20Kr=C3=BCger?= Date: Tue, 17 May 2022 11:13:03 +0100 Subject: [PATCH 3/7] [interpreter] Use core test suite in Dune manifest --- interpreter/dune-project => dune-project | 0 interpreter/dune | 8 ++++++++ 2 files changed, 8 insertions(+) rename interpreter/dune-project => dune-project (100%) diff --git a/interpreter/dune-project b/dune-project similarity index 100% rename from interpreter/dune-project rename to dune-project diff --git a/interpreter/dune b/interpreter/dune index 6601d62518..21354e7fa6 100644 --- a/interpreter/dune +++ b/interpreter/dune @@ -32,3 +32,11 @@ (_ (flags (-w +a-4-27-42-44-45-70 -warn-error +a-3)))) + +(rule + (alias runtest) + (deps + ./main.exe + (source_tree ../test)) + (action + (run ../test/core/run.py --wasm ./main.exe))) From ec36603d1b451a5b875328f28cfea8d6ea944375 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ole=20Kr=C3=BCger?= Date: Tue, 17 May 2022 11:15:12 +0100 Subject: [PATCH 4/7] [interpreter] Add 'smallint' to Dune tests --- interpreter/dune | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/interpreter/dune b/interpreter/dune index 21354e7fa6..9578af25c7 100644 --- a/interpreter/dune +++ b/interpreter/dune @@ -16,6 +16,13 @@ (flags (-open Wasm))) +(executable + (name smallint) + (modules smallint) + (libraries wasm) + (flags + (-open Wasm))) + (subdir text (rule @@ -37,6 +44,9 @@ (alias runtest) (deps ./main.exe + ./smallint.exe (source_tree ../test)) (action - (run ../test/core/run.py --wasm ./main.exe))) + (progn + (run ../test/core/run.py --wasm ./main.exe) + (run ./smallint.exe)))) From ca8965cb68a63c08785fecd574e243d988121169 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ole=20Kr=C3=BCger?= Date: Tue, 17 May 2022 12:28:59 +0100 Subject: [PATCH 5/7] [interpreter] Fix typo of WASM Co-authored-by: Andreas Rossberg --- interpreter/dune | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interpreter/dune b/interpreter/dune index 9578af25c7..6f6dfff3e0 100644 --- a/interpreter/dune +++ b/interpreter/dune @@ -3,7 +3,7 @@ (library (name wasm) ; The 'main' module shall not be part of the library, as it would start the - ; WASM REPL every time in all the dependencies. + ; Wasm REPL every time in all the dependencies. ; We also need to exclude the 'wasm' module as it overlaps with the library ; name. ; 'smallint' is a separate test module. From 0b036d5b1328c9b91d9e3d082fbd0a8413d112c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ole=20Kr=C3=BCger?= Date: Tue, 17 May 2022 12:32:10 +0100 Subject: [PATCH 6/7] [interpreter] Add Dune test target to Makefile --- interpreter/Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/interpreter/Makefile b/interpreter/Makefile index 4ff333d177..270126a7ad 100644 --- a/interpreter/Makefile +++ b/interpreter/Makefile @@ -136,7 +136,7 @@ TESTDIR = ../test/core TESTFILES = $(shell cd $(TESTDIR); ls *.wast; ls [a-z]*/*.wast) TESTS = $(TESTFILES:%.wast=%) -.PHONY: test debugtest partest +.PHONY: test debugtest partest dune-test test: $(OPT) smallint $(TESTDIR)/run.py --wasm `pwd`/$(OPT) $(if $(JS),--js '$(JS)',) @@ -168,6 +168,9 @@ quiettest/%: $(OPT) smallinttest: smallint @./smallint.native +dune-test: + dune test + # Miscellaneous targets .PHONY: clean From dfea9ea881c64ce304e59319d3db4e8e72cf6d65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ole=20Kr=C3=BCger?= Date: Tue, 17 May 2022 15:12:19 +0100 Subject: [PATCH 7/7] [interpreter] Add Makefile target for dune build --- interpreter/Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/interpreter/Makefile b/interpreter/Makefile index 270126a7ad..78fce53d84 100644 --- a/interpreter/Makefile +++ b/interpreter/Makefile @@ -27,7 +27,7 @@ JS = # set to JS shell command to run JS tests # Main targets -.PHONY: default opt unopt libopt libunopt jslib all land zip smallint +.PHONY: default opt unopt libopt libunopt jslib all land zip smallint dunebuild default: opt debug: unopt @@ -41,6 +41,8 @@ land: $(WINMAKE) all zip: $(ZIP) smallint: smallint.native +dunebuild: + dune build # Building executable @@ -168,7 +170,7 @@ quiettest/%: $(OPT) smallinttest: smallint @./smallint.native -dune-test: +dunetest: dune test # Miscellaneous targets