diff --git a/src/lake/Makefile b/src/lake/Makefile index 34034054ce..cfdfb2d506 100644 --- a/src/lake/Makefile +++ b/src/lake/Makefile @@ -4,7 +4,7 @@ LAKE ?= ./build/bin/lake # Suite Targets #------------------------------------------------------------------------------- -TESTS := $(addprefix test/, $(shell ls test)) +TESTS := $(addprefix tests/, $(shell ls tests)) EXAMPLES := $(addprefix examples/, $(filter-out bootstrap, $(shell ls examples))) default: build @@ -52,11 +52,11 @@ check-lake: # Test / Example Targets #------------------------------------------------------------------------------- -test/%.test: - cd test/$* && ./test.sh +tests/%.test: + cd tests/$* && ./test.sh -test/%.clean: - cd test/$* && ./clean.sh +tests/%.clean: + cd tests/$* && ./clean.sh examples/%.test: cd examples/$* && ./test.sh diff --git a/src/lake/test/102/.gitignore b/src/lake/tests/102/.gitignore similarity index 100% rename from src/lake/test/102/.gitignore rename to src/lake/tests/102/.gitignore diff --git a/src/lake/test/102/TBA.lean b/src/lake/tests/102/TBA.lean similarity index 100% rename from src/lake/test/102/TBA.lean rename to src/lake/tests/102/TBA.lean diff --git a/src/lake/test/102/TBA/Eulerian.lean b/src/lake/tests/102/TBA/Eulerian.lean similarity index 100% rename from src/lake/test/102/TBA/Eulerian.lean rename to src/lake/tests/102/TBA/Eulerian.lean diff --git a/src/lake/test/102/TBA/Eulerian/A.lean b/src/lake/tests/102/TBA/Eulerian/A.lean similarity index 100% rename from src/lake/test/102/TBA/Eulerian/A.lean rename to src/lake/tests/102/TBA/Eulerian/A.lean diff --git a/src/lake/test/102/clean.sh b/src/lake/tests/102/clean.sh similarity index 100% rename from src/lake/test/102/clean.sh rename to src/lake/tests/102/clean.sh diff --git a/src/lake/test/102/lakefile.lean b/src/lake/tests/102/lakefile.lean similarity index 100% rename from src/lake/test/102/lakefile.lean rename to src/lake/tests/102/lakefile.lean diff --git a/src/lake/test/102/test.sh b/src/lake/tests/102/test.sh similarity index 100% rename from src/lake/test/102/test.sh rename to src/lake/tests/102/test.sh diff --git a/src/lake/test/116/.gitignore b/src/lake/tests/116/.gitignore similarity index 100% rename from src/lake/test/116/.gitignore rename to src/lake/tests/116/.gitignore diff --git a/src/lake/test/116/clean.sh b/src/lake/tests/116/clean.sh similarity index 100% rename from src/lake/test/116/clean.sh rename to src/lake/tests/116/clean.sh diff --git a/src/lake/test/116/lakefile.lean b/src/lake/tests/116/lakefile.lean similarity index 100% rename from src/lake/test/116/lakefile.lean rename to src/lake/tests/116/lakefile.lean diff --git a/src/lake/test/116/test.sh b/src/lake/tests/116/test.sh similarity index 100% rename from src/lake/test/116/test.sh rename to src/lake/tests/116/test.sh diff --git a/src/lake/test/44/.gitignore b/src/lake/tests/44/.gitignore similarity index 100% rename from src/lake/test/44/.gitignore rename to src/lake/tests/44/.gitignore diff --git a/src/lake/test/44/clean.sh b/src/lake/tests/44/clean.sh similarity index 100% rename from src/lake/test/44/clean.sh rename to src/lake/tests/44/clean.sh diff --git a/src/lake/test/44/expected.out b/src/lake/tests/44/expected.out similarity index 100% rename from src/lake/test/44/expected.out rename to src/lake/tests/44/expected.out diff --git a/src/lake/test/44/test.sh b/src/lake/tests/44/test.sh similarity index 100% rename from src/lake/test/44/test.sh rename to src/lake/tests/44/test.sh diff --git a/src/lake/test/49/test.sh b/src/lake/tests/49/test.sh similarity index 100% rename from src/lake/test/49/test.sh rename to src/lake/tests/49/test.sh diff --git a/src/lake/test/62/.gitignore b/src/lake/tests/62/.gitignore similarity index 100% rename from src/lake/test/62/.gitignore rename to src/lake/tests/62/.gitignore diff --git a/src/lake/test/62/clean.sh b/src/lake/tests/62/clean.sh similarity index 100% rename from src/lake/test/62/clean.sh rename to src/lake/tests/62/clean.sh diff --git a/src/lake/test/62/test.sh b/src/lake/tests/62/test.sh similarity index 100% rename from src/lake/test/62/test.sh rename to src/lake/tests/62/test.sh diff --git a/src/lake/test/75/foo/.gitignore b/src/lake/tests/75/foo/.gitignore similarity index 100% rename from src/lake/test/75/foo/.gitignore rename to src/lake/tests/75/foo/.gitignore diff --git a/src/lake/test/75/foo/Main.lean b/src/lake/tests/75/foo/Main.lean similarity index 100% rename from src/lake/test/75/foo/Main.lean rename to src/lake/tests/75/foo/Main.lean diff --git a/src/lake/test/75/foo/lakefile.lean b/src/lake/tests/75/foo/lakefile.lean similarity index 100% rename from src/lake/test/75/foo/lakefile.lean rename to src/lake/tests/75/foo/lakefile.lean diff --git a/src/lake/test/75/test.sh b/src/lake/tests/75/test.sh similarity index 100% rename from src/lake/test/75/test.sh rename to src/lake/tests/75/test.sh diff --git a/src/lake/test/buildArgs/.gitignore b/src/lake/tests/buildArgs/.gitignore similarity index 100% rename from src/lake/test/buildArgs/.gitignore rename to src/lake/tests/buildArgs/.gitignore diff --git a/src/lake/test/buildArgs/clean.sh b/src/lake/tests/buildArgs/clean.sh similarity index 100% rename from src/lake/test/buildArgs/clean.sh rename to src/lake/tests/buildArgs/clean.sh diff --git a/src/lake/test/buildArgs/expected.out b/src/lake/tests/buildArgs/expected.out similarity index 100% rename from src/lake/test/buildArgs/expected.out rename to src/lake/tests/buildArgs/expected.out diff --git a/src/lake/test/buildArgs/foo.lean b/src/lake/tests/buildArgs/foo.lean similarity index 100% rename from src/lake/test/buildArgs/foo.lean rename to src/lake/tests/buildArgs/foo.lean diff --git a/src/lake/test/buildArgs/lakefile.lean b/src/lake/tests/buildArgs/lakefile.lean similarity index 100% rename from src/lake/test/buildArgs/lakefile.lean rename to src/lake/tests/buildArgs/lakefile.lean diff --git a/src/lake/test/buildArgs/test.sh b/src/lake/tests/buildArgs/test.sh similarity index 100% rename from src/lake/test/buildArgs/test.sh rename to src/lake/tests/buildArgs/test.sh diff --git a/src/lake/test/clone/.gitignore b/src/lake/tests/clone/.gitignore similarity index 100% rename from src/lake/test/clone/.gitignore rename to src/lake/tests/clone/.gitignore diff --git a/src/lake/test/clone/clean.sh b/src/lake/tests/clone/clean.sh similarity index 100% rename from src/lake/test/clone/clean.sh rename to src/lake/tests/clone/clean.sh diff --git a/src/lake/test/clone/test.sh b/src/lake/tests/clone/test.sh similarity index 100% rename from src/lake/test/clone/test.sh rename to src/lake/tests/clone/test.sh diff --git a/src/lake/test/clone/test/.gitignore b/src/lake/tests/clone/test/.gitignore similarity index 100% rename from src/lake/test/clone/test/.gitignore rename to src/lake/tests/clone/test/.gitignore diff --git a/src/lake/test/clone/test/Main.lean b/src/lake/tests/clone/test/Main.lean similarity index 100% rename from src/lake/test/clone/test/Main.lean rename to src/lake/tests/clone/test/Main.lean diff --git a/src/lake/test/clone/test/lakefile.lean b/src/lake/tests/clone/test/lakefile.lean similarity index 100% rename from src/lake/test/clone/test/lakefile.lean rename to src/lake/tests/clone/test/lakefile.lean diff --git a/src/lake/test/env/test.sh b/src/lake/tests/env/test.sh similarity index 100% rename from src/lake/test/env/test.sh rename to src/lake/tests/env/test.sh diff --git a/src/lake/test/globs/.gitignore b/src/lake/tests/globs/.gitignore similarity index 100% rename from src/lake/test/globs/.gitignore rename to src/lake/tests/globs/.gitignore diff --git a/src/lake/test/globs/Test/1.lean b/src/lake/tests/globs/Test/1.lean similarity index 100% rename from src/lake/test/globs/Test/1.lean rename to src/lake/tests/globs/Test/1.lean diff --git a/src/lake/test/globs/Test/Subtest/1.lean b/src/lake/tests/globs/Test/Subtest/1.lean similarity index 100% rename from src/lake/test/globs/Test/Subtest/1.lean rename to src/lake/tests/globs/Test/Subtest/1.lean diff --git a/src/lake/test/globs/clean.sh b/src/lake/tests/globs/clean.sh similarity index 100% rename from src/lake/test/globs/clean.sh rename to src/lake/tests/globs/clean.sh diff --git a/src/lake/test/globs/lakefile.lean b/src/lake/tests/globs/lakefile.lean similarity index 100% rename from src/lake/test/globs/lakefile.lean rename to src/lake/tests/globs/lakefile.lean diff --git a/src/lake/test/globs/test.sh b/src/lake/tests/globs/test.sh similarity index 100% rename from src/lake/test/globs/test.sh rename to src/lake/tests/globs/test.sh diff --git a/src/lake/test/lock/.gitignore b/src/lake/tests/lock/.gitignore similarity index 100% rename from src/lake/test/lock/.gitignore rename to src/lake/tests/lock/.gitignore diff --git a/src/lake/test/lock/Error.lean b/src/lake/tests/lock/Error.lean similarity index 100% rename from src/lake/test/lock/Error.lean rename to src/lake/tests/lock/Error.lean diff --git a/src/lake/test/lock/Loop.lean b/src/lake/tests/lock/Loop.lean similarity index 100% rename from src/lake/test/lock/Loop.lean rename to src/lake/tests/lock/Loop.lean diff --git a/src/lake/test/lock/Nop.lean b/src/lake/tests/lock/Nop.lean similarity index 100% rename from src/lake/test/lock/Nop.lean rename to src/lake/tests/lock/Nop.lean diff --git a/src/lake/test/lock/Wait.lean b/src/lake/tests/lock/Wait.lean similarity index 100% rename from src/lake/test/lock/Wait.lean rename to src/lake/tests/lock/Wait.lean diff --git a/src/lake/test/lock/clean.sh b/src/lake/tests/lock/clean.sh similarity index 100% rename from src/lake/test/lock/clean.sh rename to src/lake/tests/lock/clean.sh diff --git a/src/lake/test/lock/lakefile.lean b/src/lake/tests/lock/lakefile.lean similarity index 100% rename from src/lake/test/lock/lakefile.lean rename to src/lake/tests/lock/lakefile.lean diff --git a/src/lake/test/lock/test.sh b/src/lake/tests/lock/test.sh similarity index 100% rename from src/lake/test/lock/test.sh rename to src/lake/tests/lock/test.sh diff --git a/src/lake/test/manifest/.gitignore b/src/lake/tests/manifest/.gitignore similarity index 100% rename from src/lake/test/manifest/.gitignore rename to src/lake/tests/manifest/.gitignore diff --git a/src/lake/test/manifest/clean.sh b/src/lake/tests/manifest/clean.sh similarity index 100% rename from src/lake/test/manifest/clean.sh rename to src/lake/tests/manifest/clean.sh diff --git a/src/lake/test/manifest/test.sh b/src/lake/tests/manifest/test.sh similarity index 100% rename from src/lake/test/manifest/test.sh rename to src/lake/tests/manifest/test.sh diff --git a/src/lake/test/meta/.gitignore b/src/lake/tests/meta/.gitignore similarity index 100% rename from src/lake/test/meta/.gitignore rename to src/lake/tests/meta/.gitignore diff --git a/src/lake/test/meta/lakefile.lean b/src/lake/tests/meta/lakefile.lean similarity index 100% rename from src/lake/test/meta/lakefile.lean rename to src/lake/tests/meta/lakefile.lean diff --git a/src/lake/test/meta/test.sh b/src/lake/tests/meta/test.sh similarity index 100% rename from src/lake/test/meta/test.sh rename to src/lake/tests/meta/test.sh diff --git a/src/lake/test/precompileArgs/.gitignore b/src/lake/tests/precompileArgs/.gitignore similarity index 100% rename from src/lake/test/precompileArgs/.gitignore rename to src/lake/tests/precompileArgs/.gitignore diff --git a/src/lake/test/precompileArgs/Foo.lean b/src/lake/tests/precompileArgs/Foo.lean similarity index 100% rename from src/lake/test/precompileArgs/Foo.lean rename to src/lake/tests/precompileArgs/Foo.lean diff --git a/src/lake/test/precompileArgs/Foo/Bar.lean b/src/lake/tests/precompileArgs/Foo/Bar.lean similarity index 100% rename from src/lake/test/precompileArgs/Foo/Bar.lean rename to src/lake/tests/precompileArgs/Foo/Bar.lean diff --git a/src/lake/test/precompileArgs/clean.sh b/src/lake/tests/precompileArgs/clean.sh similarity index 100% rename from src/lake/test/precompileArgs/clean.sh rename to src/lake/tests/precompileArgs/clean.sh diff --git a/src/lake/test/precompileArgs/lakefile.lean b/src/lake/tests/precompileArgs/lakefile.lean similarity index 100% rename from src/lake/test/precompileArgs/lakefile.lean rename to src/lake/tests/precompileArgs/lakefile.lean diff --git a/src/lake/test/precompileArgs/test.sh b/src/lake/tests/precompileArgs/test.sh similarity index 100% rename from src/lake/test/precompileArgs/test.sh rename to src/lake/tests/precompileArgs/test.sh diff --git a/src/shell/CMakeLists.txt b/src/shell/CMakeLists.txt index 6aabcb2faf..62be3e37bf 100644 --- a/src/shell/CMakeLists.txt +++ b/src/shell/CMakeLists.txt @@ -175,7 +175,7 @@ ENDFOREACH(T) # bootstrap: too slow # 62: requires elan to download toolchain file(GLOB_RECURSE LEANLAKETESTS - "${LEAN_SOURCE_DIR}/lake/test/test.sh" + "${LEAN_SOURCE_DIR}/lake/tests/test.sh" "${LEAN_SOURCE_DIR}/lake/examples/test.sh") FOREACH(T ${LEANLAKETESTS}) if(NOT T MATCHES ".*(lake-packages|bootstrap|62).*")