harness v1.2: repo/ nested-layout symlink for rows whose test_cmds expect it; context-expansion skips missing test files instead of crashing (eza row 0070)

scripts/verify.py

@@ -1,4 +1,4 @@
-"""PatchBench row verification + context expansion harness (v1.1).
+"""PatchBench row verification + context expansion harness (v1.2).
 
 For each candidate row:
   1. clone the repo at base_commit
@@ -36,6 +36,11 @@ v1.0: used_bytes() timed out on 40G+ du scans (empty output parsed as 0 => guard
 
 v1.1: one dev-profile cargo build grew the shared target dir 6.7G->43G and evicted the pod before the watchdog's du scan could catch it. Fixed both causes: cargo now strips debuginfo and disables incremental compilation in dev/test profiles (no effect on test outcomes, cuts target-dir size several-fold); the in-run watchdog monitors only /tmp/pb-cargo-target (fast du scans even under pressure) at a 20GiB limit instead of scanning all of /tmp at 32GiB.
 
+v1.2: some rows' test_cmds use a nested repo/ layout (cd repo, --manifest-path
+repo/Cargo.toml) from the upstream /testbed/repo convention -- a self-symlink now
+makes both layouts resolve. Context expansion skips test files referenced by the
+test_patch that don't exist on disk instead of crashing the row (eza 0070).
+
 Usage (inside a job with the right language toolchain image):
   python verify.py --lang go --file pilot/candidates/go.jsonl --limit 6
 """
@@ -338,6 +343,16 @@ def verify_row(row, lang):
             return rec
     log_disk(f"cloned:{row['id']}")
 
+    # v1.2: some rows reference a nested repo/ layout (e.g. test_cmds using
+    # "cd repo" or paths ending in /repo) that our flat clone does not have.
+    # Create a self-symlink so both layouts resolve; idempotent on reruns.
+    _cmds = (row.get("test_cmds") or []) + (row.get("rebuild_cmds") or []) + (row.get("print_cmds") or [])
+    if any(("repo/" in c) or c.rstrip().endswith("/repo") for c in _cmds):
+        _sl = os.path.join(repo_dir, "repo")
+        if not (os.path.islink(_sl) or os.path.exists(_sl)):
+            os.symlink(repo_dir, _sl)
+            print("repo-layout symlink created")
+
     if lang == "rust":
         os.environ["CARGO_TARGET_DIR"] = RUST_SHARED_TARGET
         # v1.1: a dev-profile build with debuginfo hit 43G on the 50G container
@@ -418,8 +433,12 @@ def verify_row(row, lang):
         rec["context_files"] = ctx
         rec["context_lines"] = nlines
         rec["buggy_files"] = sorted(buggy - tfiles)
-        rec["test_files"] = [{"path": p, "content": open(os.path.join(repo_dir, p), errors="replace").read()}
-                             for p in sorted(tfiles)]
+        rec["test_files"] = []
+        for _p in sorted(tfiles):
+            try:
+                rec["test_files"].append({"path": _p, "content": open(os.path.join(repo_dir, _p), errors="replace").read()})
+            except OSError:
+                pass  # v1.2: missing files are silently skipped
         rec["eval"] = {"test_cmds": row["test_cmds"], "print_cmds": row.get("print_cmds"),
                        "log_parser": row["log_parser"], "rebuild_cmds": row.get("rebuild_cmds")}
     return rec