From 72504faca7c35d220670c4e56f0fd15d8e1d1050 Mon Sep 17 00:00:00 2001 From: James Hamlin Date: Sat, 20 Sep 2025 00:41:06 -0700 Subject: [PATCH 1/3] Add clojure-test-suite Signed-off-by: James Hamlin --- .gitmodules | 3 +++ test/clojure-test-suite | 1 + 2 files changed, 4 insertions(+) create mode 100644 .gitmodules create mode 160000 test/clojure-test-suite diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..96e2900 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "test/clojure-test-suite"] + path = test/clojure-test-suite + url = git@github.com:glojurelang/clojure-test-suite.git diff --git a/test/clojure-test-suite b/test/clojure-test-suite new file mode 160000 index 0000000..08f4c3a --- /dev/null +++ b/test/clojure-test-suite @@ -0,0 +1 @@ +Subproject commit 08f4c3aaaeef652f62ba78e905ffea0b53774d85 From ba359dfe4ba9d5c01a92a5c369fb126c62846126 Mon Sep 17 00:00:00 2001 From: James Hamlin Date: Sat, 20 Sep 2025 01:06:05 -0700 Subject: [PATCH 2/3] Run clojure-test-suite in CI Signed-off-by: James Hamlin --- Makefile | 2 ++ test/clojure-test-suite | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 863b9ce..9e020d3 100644 --- a/Makefile +++ b/Makefile @@ -95,6 +95,8 @@ $(TEST_TARGETS): gocmd $(GLJ) .PHONY: test test: $(TEST_TARGETS) # vet - vet is disabled until we fix errors in generated code + @cd test/clojure-test-suite && \ + ../../$(GLJ) test-glojure.glj --expect-failures 38 --expect-errors 151 2>/dev/null .PHONY: format format: diff --git a/test/clojure-test-suite b/test/clojure-test-suite index 08f4c3a..8d3ea9b 160000 --- a/test/clojure-test-suite +++ b/test/clojure-test-suite @@ -1 +1 @@ -Subproject commit 08f4c3aaaeef652f62ba78e905ffea0b53774d85 +Subproject commit 8d3ea9bb74dd0e683a9a519e44a1d01bc642cc42 From 950ec500c3588c33a9a275f01410e0d89c17d3a9 Mon Sep 17 00:00:00 2001 From: James Hamlin Date: Sat, 20 Sep 2025 01:09:22 -0700 Subject: [PATCH 3/3] Clone submodules in CI Signed-off-by: James Hamlin --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9fe8b12..ba4cf13 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,6 +14,8 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 + with: + submodules: recursive - uses: cachix/install-nix-action@v19 with: nix_path: nixpkgs=channel:nixos-unstable