1 files changed, 21 insertions, 7 deletions
diff --git a/modules/nixos-hardware/tests/run.py b/modules/nixos-hardware/tests/run.py
index 653337d19190..2f514d128907 100755
--- a/modules/nixos-hardware/tests/run.py
+++ b/modules/nixos-hardware/tests/run.py
@@ -1,11 +1,12 @@
 #!/usr/bin/env nix-shell
-#!nix-shell -p nix -p python3 -i python
+#!nix-shell --quiet -p nix -p python3 -i python
 
 import argparse
 import multiprocessing
 import re
 import subprocess
 import sys
+from functools import partial
 from pathlib import Path
 from typing import List, Tuple
 
@@ -26,25 +27,34 @@ def parse_readme() -> List[str]:
     return list(profiles)
 
 
-def build_profile(profile: str) -> Tuple[str, subprocess.CompletedProcess]:
+def build_profile(
+    profile: str, verbose: bool
+) -> Tuple[str, subprocess.CompletedProcess]:
     # Hard-code this for now until we have enough other architectures to care about this.
     system = "x86_64-linux"
     if "raspberry-pi/2" in profile:
         system = "armv7l-linux"
 
     cmd = [
-        "nix-build",
+        "nix",
+        "build",
+        "-f",
+        "build-profile.nix",
         "-I",
         f"nixos-hardware={ROOT}",
-        "--dry-run",
         "--show-trace",
-        "build-profile.nix",
         "--system",
         system,
         "--arg",
         "profile",
         profile,
     ]
+
+    # uses import from derivation
+    if profile != "<nixos-hardware/toshiba/swanky>":
+        cmd += ["--dry-run"]
+    if verbose:
+        print(f"$ {' '.join(cmd)}")
     res = subprocess.run(
         cmd, cwd=TEST_ROOT, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True,
     )
@@ -60,6 +70,9 @@ def parse_args() -> argparse.Namespace:
         help="Number of parallel evaluations."
         "If set to 1 it disable multi processing (suitable for debugging)",
     )
+    parser.add_argument(
+        "--verbose", action="store_true", help="Print evaluation commands executed",
+    )
     parser.add_argument("profiles", nargs="*")
     return parser.parse_args()
 
@@ -84,12 +97,13 @@ def main() -> None:
             print(f"{RED}{res.stderr.rstrip()}{RESET}", file=sys.stderr)
             failed_profiles.append(profile)
 
+    build = partial(build_profile, verbose=args.verbose)
     if len(profiles) == 0 or args.jobs == 1:
         for profile in profiles:
-            eval_finished(build_profile(profile))
+            eval_finished(build(profile))
     else:
         pool = multiprocessing.Pool(processes=args.jobs)
-        for r in pool.imap(build_profile, profiles):
+        for r in pool.imap(build, profiles):
             eval_finished(r)
     if len(failed_profiles) > 0:
         print(f"\n{RED}The following {len(failed_profiles)} test(s) failed:{RESET}")