Separate macro and prover failures

nickdrozd · Dec 18, 2024 · 9ad06df · 9ad06df
1 parent 88f1c71
commit 9ad06df
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 12 deletions.
diff --git a/test/prog_data.py b/test/prog_data.py
@@ -2682,20 +2682,29 @@
     "1RB 3LA 4LB 0RB 1RA 3LA  2LA 2RA 4LA 1RA 5RB ...": "count_apps",  # 10^^90
 }
 
-PROVER_FAILURES = {
-    "1RB 2LA 3RB 0RB  0LB 1LA 2RB ...",
+MACRO_FAILURES = {
+    "1RB 2RB 2LA  0LB 1LA 0RB": 0,
+    "1RB 2RB 2LA  2LB 1LA 0RB": 0,
 
-    "1RB 1RC 0RC  1RC 0LA 1LB  2LC 2RA 1LB",
-    "1RB 0RC 1LA  2LA 0LA 2RB  2RC 2RB 1LC",
+    "1RB 2LA 3RB 0RB  0LB 1LA 2RB ...": 0,
 
-    "1RB 0LA  0LC 0RD  0RA 1LB  1RC 1LE  0LE 1LC",
+    "1RB 0RC 1LA  2LA 0LA 2RB  2RC 2RB 1LC": 0,
+
+    "1RB 0LA  0LC 0RD  0RA 1LB  1RC 1LE  0LE 1LC": 4,
+
+    "1RB 0RC  1RC 0RA  1RD 1RC  1LE 1RF  0LB 1LE  ... 1RB": 0,
+    "1RB 0RC  1RC 0RA  1RD 1RC  1LE 1RF  0LB 1LE  1RF 1RB": 0,
+}
+
+PROVER_FAILURES = {
+    "1RB 1RC 0RC  1RC 0LA 1LB  2LC 2RA 1LB",
 
     "1RB 1LB 3RA 4LA 2LA 4LB  2LA 2RB 3LB 1LA 5RA ...",
 
-    "1RB 0RC  1RC 0RA  1RD 1RC  1LE 1RF  0LB 1LE  ... 1RB",
-    "1RB 0RC  1RC 0RA  1RD 1RC  1LE 1RF  0LB 1LE  1RF 1RB",
 }
 
+FAILURES = set(MACRO_FAILURES) | PROVER_FAILURES
+
 SUSPECTED_RULES = {
     "1RB 2LB 4LB 3LA ...  1LA 3RA 3LB 0LB 0RA",
     "1RB 2LA 1RA 2LB 2LA  0LA 2RB 3RB 4RA ...",

diff --git a/test/test_turing.py b/test/test_turing.py
@@ -1146,7 +1146,7 @@ def _test_prover(  # type: ignore[misc]
 
     def _test_prover_est(self, prog_data: ProverEst):
         for prog, marks in prog_data.items():
-            if prog in PROVER_FAILURES:
+            if prog in FAILURES:
                 continue
 
             if prog in PROVER_HALT_TOO_SLOW and not RUN_SLOW:
@@ -1226,11 +1226,16 @@ def _test_prover_est(self, prog_data: ProverEst):
                     SUSPECTED_RULES)
 
     def test_infrul(self):
-        for prog in INFRUL - PROVER_FAILURES:
+        for prog in INFRUL:
             self.run_bb(
                 prog,
-                opt_macro = 3_000,
-                normal = False)
+                normal = False,
+                **(
+                    {'opt_macro': 3_000}  # type: ignore[arg-type]
+                    if (blocks := MACRO_FAILURES.get(prog)) is None else
+                    {'blocks': blocks}
+                ),
+            )
 
             self.assertIsNotNone(
                 self.machine.infrul)
@@ -1249,7 +1254,7 @@ def test_rule_limit(self):
         for prog, reason in RULE_LIMIT.items():
             self.run_bb(
                 prog,
-                print_prog = prog not in PROVER_FAILURES,
+                print_prog = prog not in FAILURES,
                 normal = False,
                 opt_macro = 1600,
             )