run only benchmarks and no other tests

NilFoundation · Nov 28, 2024 · 049bc76 · 049bc76
1 parent dfd8828
commit 049bc76
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 9 deletions.
diff --git a/crypto3.nix b/crypto3.nix
@@ -39,7 +39,7 @@ in stdenv.mkDerivation {
       "-G Ninja"
     ];
 
-  doCheck = runTests; # tests are inside crypto3-tests derivation
+  doCheck = runTests || benchmarkTests;
 
   checkPhase = ''
     # JUNIT file without explicit file name is generated after the name of the master test suite inside `CMAKE_CURRENT_SOURCE_DIR`

diff --git a/flake.nix b/flake.nix
@@ -41,7 +41,8 @@
             sanitize = true;
           });
           crypto3-clang-bench = (pkgs.callPackage ./crypto3.nix {
-            runTests = true;
+            stdenv = pkgs.llvmPackages_19.stdenv;
+            runTests = false;
             enableDebug = false;
             benchmarkTests = true;
           });
@@ -60,7 +61,8 @@
             enableDebug = false;
           });
           parallel-crypto3-clang-bench = (pkgs.callPackage ./parallel-crypto3.nix {
-            runTests = true;
+            stdenv = pkgs.llvmPackages_19.stdenv;
+            runTests = false;
             enableDebug = false;
             benchmarkTests = true;
           });
@@ -112,7 +114,7 @@
             enableDebug = false;
           });
           crypto3-gcc-bench = (pkgs.callPackage ./crypto3.nix {
-            runTests = true;
+            runTests = false;
             enableDebug = false;
             benchmarkTests = true;
           });
@@ -129,19 +131,19 @@
           });
           crypto3-clang-bench = (pkgs.callPackage ./crypto3.nix {
             stdenv = pkgs.llvmPackages_19.stdenv;
-            runTests = true;
+            runTests = false;
             enableDebug = false;
             benchmarkTests = true;
           });
 
           parallel-crypto3-gcc = (pkgs.callPackage ./parallel-crypto3.nix {
             runTests = true;
             enableDebug = false;
-            benchmarkTests = true;
           });
           parallel-crypto3-gcc-bench = (pkgs.callPackage ./parallel-crypto3.nix {
-            runTests = true;
+            runTests = false;
             enableDebug = false;
+            benchmarkTests = true;
           });
           parallel-crypto3-clang = (pkgs.callPackage ./parallel-crypto3.nix {
             stdenv = pkgs.llvmPackages_19.stdenv;
@@ -155,7 +157,7 @@
           });
           parallel-crypto3-clang-bench = (pkgs.callPackage ./parallel-crypto3.nix {
             stdenv = pkgs.llvmPackages_19.stdenv;
-            runTests = true;
+            runTests = false;
             enableDebug = false;
             benchmarkTests = true;
           });
@@ -184,6 +186,10 @@
             name = "all";
             paths = [ crypto3-clang-sanitize parallel-crypto3-clang-sanitize proof-producer-clang-sanitize ];
           };
+          all-clang-benchmarks = pkgs.symlinkJoin {
+            name = "all";
+            paths = [ crypto3-clang-bench parallel-crypto3-clang-bench ];
+          };
           all-gcc = pkgs.symlinkJoin {
             name = "all";
             paths = [ crypto3-gcc parallel-crypto3-gcc proof-producer-gcc ];

diff --git a/parallel-crypto3.nix b/parallel-crypto3.nix
@@ -39,7 +39,7 @@ in stdenv.mkDerivation {
       "-DPARALLEL_CRYPTO3_ENABLE=TRUE"
     ];
 
-  doCheck = runTests; # tests are inside parallel-crypto3-tests derivation
+  doCheck = runTests || benchmarkTests;
 
   checkPhase = ''
     # JUNIT file without explicit file name is generated after the name of the master test suite inside `CMAKE_CURRENT_SOURCE_DIR`
@@ -49,6 +49,7 @@ in stdenv.mkDerivation {
     cd ..
     mkdir -p ${placeholder "out"}/test-logs
     find .. -type f -name '*_test.xml' -exec cp {} ${placeholder "out"}/test-logs \;
+    find .. -type f -name '*_benchmark.xml' -exec cp {} ${placeholder "out"}/test-logs \;
   '';
 
   shellHook = ''