Fixed check command

holochain-open-dev · Jun 4, 2024 · 8f11155 · 8f11155
1 parent 7dd78a6
commit 8f11155
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 15 deletions.
diff --git a/nix/fixtures/module-repo/flake.lock b/nix/fixtures/module-repo/flake.lock
diff --git a/nix/sweettest.nix b/nix/sweettest.nix
@@ -24,14 +24,12 @@ let
       cratesNames = builtins.map (toml: toml.package.name) nonWorkspaceCrates;
     in cratesNames;
   packageList = listCratesFromWorkspace src;
-  packages =
-    builtins.toString (builtins.map (c: " --package ${c}") packageList);
 
   workspaceCargoArtifacts =
     (craneLib.callPackage ./buildDepsOnlyWithArtifacts.nix { }) (commonArgs // {
       doCheck = false;
-      cargoBuildCommand = "cargoWorkspace build --tests";
-      cargoTestCommand = "cargoWorkspace test";
+      cargoBuildCommand = "cargoWorkspace build --tests --locked";
+      cargoExtraArgs = "";
       cargoCheckCommand = "";
       preBuild = ''
         cargoWorkspace() {
@@ -47,22 +45,12 @@ let
       pname = "workspace-sweettest";
       version = cargoToml.package.version;
     });
-  # workspaceCargoArtifacts =
-  #   (craneLib.callPackage ./buildDepsOnlyWithArtifacts.nix { }) (commonArgs // {
-  #     doCheck = false;
-  #     cargoExtraArgs = "--workspace --locked --all-targets";
-
-  #     pname = "workspace-sweettest";
-  #     version = cargoToml.package.version;
-  #   });
 
 in craneLib.cargoNextest (commonArgs // {
   cargoArtifacts = workspaceCargoArtifacts;
   pname = "${crate}-test";
   version = cargoToml.package.version;
 
-  # cargoTestArgs = "-p ${crate} -j 1";
-  # cargoExtraArgs = "--locked";
   cargoNextestExtraArgs = "-p ${crate} -j 1";
 
   DNA_PATH = dna;