From 659ad511b29dfaf125bcba0ce09344048f61cae6 Mon Sep 17 00:00:00 2001 From: Ng Zhi An Date: Thu, 4 Feb 2021 17:54:40 -0800 Subject: [PATCH 1/2] Skip _output directory when listing wast files for test. Follow-up to #434. Now `make partest && make partest` shouldn't fail. --- interpreter/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/interpreter/Makefile b/interpreter/Makefile index 34d4dea15..727f39b94 100644 --- a/interpreter/Makefile +++ b/interpreter/Makefile @@ -113,7 +113,8 @@ $(WINMAKE): clean # Executing test suite TESTDIR = ../test/core -TESTFILES = $(shell cd $(TESTDIR); ls *.wast; ls */*.wast) +# Skip _output directory, since that's a tmp directory, and list all other wast files. +TESTFILES = $(shell cd $(TESTDIR); find . -name _output -prune -o -name '*.wast' -print) TESTS = $(TESTFILES:%.wast=%) .PHONY: test debugtest partest From ff74dacf77c0035561b318c9c5672b62bf203bd7 Mon Sep 17 00:00:00 2001 From: Ng Zhi An Date: Tue, 9 Feb 2021 10:37:05 -0800 Subject: [PATCH 2/2] Use a simpler glob Co-authored-by: Andreas Rossberg --- interpreter/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interpreter/Makefile b/interpreter/Makefile index 727f39b94..63be81714 100644 --- a/interpreter/Makefile +++ b/interpreter/Makefile @@ -114,7 +114,7 @@ $(WINMAKE): clean TESTDIR = ../test/core # Skip _output directory, since that's a tmp directory, and list all other wast files. -TESTFILES = $(shell cd $(TESTDIR); find . -name _output -prune -o -name '*.wast' -print) +TESTFILES = $(shell cd $(TESTDIR); ls *.wast; ls [a-z]*/*.wast) TESTS = $(TESTFILES:%.wast=%) .PHONY: test debugtest partest