fix(tests): keep snapshots for -fail and -unsupported

Stevengre · Stevengre · commit 2c3bb1d05bd6 · 2026-04-13T13:07:11.000Z
diff --git a/kmir/src/kmir/cargo.py b/kmir/src/kmir/cargo.py
@@ -182,6 +182,9 @@ def cargo_get_smir_json(
     cwd = cwd or Path.cwd()
     smir_json_result = cwd / rs_file.with_suffix('.smir.json').name
     run_process_2(command, cwd=cwd)
+    resolved_smir_json_result = cwd / rs_file.resolve().with_suffix('.smir.json').name
+    if not smir_json_result.is_file() and resolved_smir_json_result.is_file():
+        resolved_smir_json_result.rename(smir_json_result)
     json_smir = json.loads(smir_json_result.read_text())
     _LOGGER.info(f'Loaded: {smir_json_result}')
     if save_smir:
diff --git a/kmir/src/kmir/testing/fixtures.py b/kmir/src/kmir/testing/fixtures.py
@@ -31,20 +31,26 @@ def _normalize_symbol_hashes(text: str) -> str:
     return text
 
 
+def _normalize_show_output(text: str) -> str:
+    text = _normalize_symbol_hashes(text)
+    text = re.sub(r'(?m)^(\s*(?:[│┃┊]\s*)?span: )\d+$', r'\1<span>', text)
+    text = re.sub(r'(?m)^\s*>> message: .*\n?', '', text)
+    return text.rstrip('\r\n')
+
+
 def assert_or_update_show_output(
     actual_text: str, expected_file: Path, *, update: bool, path_replacements: dict[str, str] | None = None
 ) -> None:
     if path_replacements:
         for old, new in path_replacements.items():
             actual_text = actual_text.replace(old, new)
-    # Normalize rustc symbol hash suffixes that can drift across builds/environments.
-    actual_text = _normalize_symbol_hashes(actual_text)
+    actual_text = _normalize_show_output(actual_text)
     if update:
         expected_file.write_text(actual_text)
     else:
         assert expected_file.is_file()
         expected_text = expected_file.read_text()
-        expected_text = _normalize_symbol_hashes(expected_text)
+        expected_text = _normalize_show_output(expected_text)
         if actual_text != expected_text:
             diff = '\n'.join(
                 unified_diff(
diff --git a/kmir/src/tests/integration/data/prove-rs/show/assert-false-fail.main.expected b/kmir/src/tests/integration/data/prove-rs/show/assert-false-fail.main.expected
@@ -0,0 +1,15 @@
+
+┌─ 1 (root, init)
+│   #execTerminator ( terminator ( ... kind: terminatorKindCall ( ... func: operandC
+│   span: 0
+│
+│  (8 steps)
+└─ 3 (stuck, leaf)
+    #setUpCalleeData ( monoItemFn ( ... name: symbol ( "_ZN4core9panicking5panic17h<hash>
+    span: 32
+
+
+┌─ 2 (root, leaf, target, terminal)
+│   #EndProgram ~> .K
+
+
diff --git a/kmir/src/tests/integration/data/prove-rs/show/enum-two-refs-unsupported.main.expected b/kmir/src/tests/integration/data/prove-rs/show/enum-two-refs-unsupported.main.expected
@@ -0,0 +1,22 @@
+
+┌─ 1 (root, init)
+│   #execTerminator ( terminator ( ... kind: terminatorKindCall ( ... func: operandC
+│   span: 0
+│
+│  (10 steps)
+├─ 3
+│   #decodeConstant ( constantKindAllocated ( allocation ( ... bytes: b"\x00\x00\x00
+│   function: main
+│   span: 118
+│
+│  (1 step)
+└─ 4 (leaf, terminal)
+    thunk ( #decodeConstant ( constantKindAllocated ( allocation ( ... bytes: b"\x00
+    function: main
+    span: 118
+
+
+┌─ 2 (root, leaf, target, terminal)
+│   #EndProgram ~> .K
+
+
diff --git a/kmir/src/tests/integration/data/prove-rs/show/loop-unsupported.main.expected b/kmir/src/tests/integration/data/prove-rs/show/loop-unsupported.main.expected
@@ -0,0 +1,15 @@
+
+┌─ 1 (root, init)
+│   #execTerminator ( terminator ( ... kind: terminatorKindCall ( ... func: operandC
+│   span: 0
+│
+│  (1450 steps)
+└─ 3 (stuck, leaf)
+    #setUpCalleeData ( monoItemFn ( ... name: symbol ( "_ZN4core9panicking5panic17h<hash>
+    span: 32
+
+
+┌─ 2 (root, leaf, target, terminal)
+│   #EndProgram ~> .K
+
+
diff --git a/kmir/src/tests/integration/data/prove-rs/show/offset-u8-unsupported.main.expected b/kmir/src/tests/integration/data/prove-rs/show/offset-u8-unsupported.main.expected
@@ -3,10 +3,15 @@
 │   #execTerminator ( terminator ( ... kind: terminatorKindCall ( ... func: operandC
 │   span: 0
 │
-│  (35 steps)
-└─ 3 (stuck, leaf)
-    #traverseProjection ( toAlloc ( allocId ( 0 ) ) , StringVal ( "123" ) , .Project
-    span: 48
+│  (16 steps)
+├─ 3
+│   #decodeConstant ( constantKindAllocated ( allocation ( ... bytes: b"\x00\x00\x00
+│   span: 63
+│
+│  (1 step)
+└─ 4 (leaf, terminal)
+    thunk ( #decodeConstant ( constantKindAllocated ( allocation ( ... bytes: b"\x00
+    span: 63
 
 
 ┌─ 2 (root, leaf, target, terminal)
diff --git a/kmir/src/tests/integration/data/prove-rs/show/volatile_load_static-unsupported.main.expected b/kmir/src/tests/integration/data/prove-rs/show/volatile_load_static-unsupported.main.expected
@@ -7,13 +7,13 @@
 ├─ 3
 │   #decodeConstant ( constantKindAllocated ( allocation ( ... bytes: b"\x00\x00\x00
 │   function: main
-│   span: 56
+│   span: 53
 │
 │  (1 step)
 └─ 4 (leaf, terminal)
     thunk ( #decodeConstant ( constantKindAllocated ( allocation ( ... bytes: b"\x00
     function: main
-    span: 56
+    span: 53
 
 
 ┌─ 2 (root, leaf, target, terminal)
diff --git a/kmir/src/tests/integration/data/prove-rs/show/volatile_store_static-unsupported.main.expected b/kmir/src/tests/integration/data/prove-rs/show/volatile_store_static-unsupported.main.expected
@@ -7,13 +7,13 @@
 ├─ 3
 │   #decodeConstant ( constantKindAllocated ( allocation ( ... bytes: b"\x00\x00\x00
 │   function: main
-│   span: 57
+│   span: 54
 │
 │  (1 step)
 └─ 4 (leaf, terminal)
     thunk ( #decodeConstant ( constantKindAllocated ( allocation ( ... bytes: b"\x00
     function: main
-    span: 57
+    span: 54
 
 
 ┌─ 2 (root, leaf, target, terminal)
diff --git a/kmir/src/tests/integration/test_integration.py b/kmir/src/tests/integration/test_integration.py
@@ -49,37 +49,43 @@
     ids=[spec.stem for spec in PROVE_FILES],
 )
 def test_prove(rs_file: Path, kmir: KMIR, update_expected_output: bool) -> None:
-    should_fail = rs_file.stem.endswith('fail') or rs_file.stem.endswith('unsupported')
+    should_fail = rs_file.stem.endswith('fail')
+    should_show = should_fail or rs_file.stem.endswith('unsupported')
     is_smir = rs_file.suffix == '.json'
 
-    if update_expected_output and not should_fail:
+    start_symbols = ['main']
+    if rs_file.stem in PROVE_START_SYMBOLS:
+        start_symbols = PROVE_START_SYMBOLS[rs_file.stem]
+
+    if update_expected_output and not should_show:
+        for start_symbol in start_symbols:
+            expected_file = PROVE_DIR / f'show/{rs_file.stem}.{start_symbol}.expected'
+            assert not expected_file.is_file()
         pytest.skip()
 
     prove_opts = ProveOpts(rs_file, smir=is_smir, terminate_on_thunk=True)
     printer = PrettyPrinter(kmir.definition)
     cterm_show = CTermShow(printer.print)
 
-    start_symbols = ['main']
-    if rs_file.stem in PROVE_START_SYMBOLS:
-        start_symbols = PROVE_START_SYMBOLS[rs_file.stem]
-
     for start_symbol in start_symbols:
         prove_opts.start_symbol = start_symbol
         apr_proof = kmir.prove_program(prove_opts)
+        expected_file = PROVE_DIR / f'show/{rs_file.stem}.{start_symbol}.expected'
 
-        if should_fail:
-            assert apr_proof.failed
+        if should_show:
             display_opts = ShowOpts(
                 rs_file.parent, apr_proof.id, full_printer=False, smir_info=None, omit_current_body=False
             )
             shower = APRProofShow(kmir.definition, node_printer=KMIRAPRNodePrinter(cterm_show, apr_proof, display_opts))
             show_res = '\n'.join(shower.show(apr_proof))
-            assert_or_update_show_output(
-                show_res, PROVE_DIR / f'show/{rs_file.stem}.{start_symbol}.expected', update=update_expected_output
-            )
+            assert_or_update_show_output(show_res, expected_file, update=update_expected_output)
         else:
+            assert not expected_file.is_file()
             assert apr_proof.passed
 
+        if should_fail:
+            assert apr_proof.failed
+
 
 VERIFY_RUST_STD_DIR = (Path(__file__).parent / 'data' / 'verify-rust-std').resolve(strict=True)
 VERIFY_RUST_STD_FILES = list(VERIFY_RUST_STD_DIR.glob('**/*.rs'))
