Merge remote-tracking branch 'origin/develop'

Author: rv-auditor

.github/workflows/test.yml

@@ -45,6 +45,9 @@ jobs:
       - name: 'Build pattern matching compiler'
         run: GC_DONT_GC=1 nix build --print-build-logs .#llvm-backend-matching
 
+      - name: 'Smoke test integration test shell'
+        run: GC_DONT_GC=1 nix develop --print-build-logs .#integration-test-shell-18 --command lit -v test/defn/imp.kore
+
       - name: 'Test LLVM backend'
         run: GC_DONT_GC=1 nix flake check --print-build-logs
 

flake.nix

@@ -111,7 +111,7 @@
             {
               name = "llvm-backend-${toString args.llvm-version}-${args.build-type}";
               value = {
-                inherit (pkgs) llvm-backend llvm-backend-matching llvm-kompile-testing integration-tests;
+                inherit (pkgs) llvm-backend llvm-backend-matching llvm-kompile-testing integration-tests integration-test-shell;
               };
             }
         ));
@@ -120,6 +120,11 @@
           inherit (llvm-backend-18-FastBuild) llvm-backend llvm-backend-matching llvm-kompile-testing;
           default = llvm-backend-18-FastBuild.llvm-backend;
           llvm-backend-release = llvm-backend-18-Release.llvm-backend;
+
+          integration-test-shell-15 = llvm-backend-15-Debug.integration-test-shell;
+          integration-test-shell-16 = llvm-backend-16-Debug.integration-test-shell;
+          integration-test-shell-17 = llvm-backend-17-Debug.integration-test-shell;
+          integration-test-shell-18 = llvm-backend-18-Debug.integration-test-shell;
         };
 
         checks = listToChecks [

nix/overlay.nix

@@ -54,6 +54,13 @@ let
     patchShebangs "$out/bin/llvm-kompile-testing"
   '';
 
+  integration-test-env = ''
+    export PYTHON_INTERPRETER=${llvm-backend.python-interpreter}
+    export BINDINGS_INSTALL_PATH=${llvm-backend}/lib/kllvm/python
+    export INCLUDE_INSTALL_PATH=${llvm-backend}/include
+    export LIT_USE_NIX=1
+  '';
+
   integration-tests = prev.stdenv.mkDerivation {
     name = "llvm-backend-integration-tests";
     src = llvm-backend.src;
@@ -66,16 +73,16 @@ let
       llvm-backend # the system under test
     ];
     configurePhase = "true";
+
     buildPhase = ''
       runHook preBuild
 
-      PYTHON_INTERPRETER=${llvm-backend.python-interpreter} \
-      BINDINGS_INSTALL_PATH=${llvm-backend}/lib/kllvm/python \
-      INCLUDE_INSTALL_PATH=${llvm-backend}/include \
-        LIT_USE_NIX=1 lit -v test
+      ${integration-test-env}
+      lit -v test
 
       runHook postBuild
     '';
+
     installPhase = ''
       runHook preInstall
 
@@ -85,8 +92,13 @@ let
       runHook postInstall
     '';
   };
+
+  integration-test-shell = prev.mkShell {
+    inputsFrom = [ integration-tests ];
+    shellHook = integration-test-env;
+  };
 in {
   inherit kllvm llvm-backend llvm-backend-matching llvm-kompile-testing
-    integration-tests;
+    integration-tests integration-test-shell;
   inherit (prev) clang; # for compatibility
 }