factor out parsing #substitute and #markHEADmaster

1 files changed, 14 insertions, 11 deletions

diff --git a/src/prove.c b/src/prove.c
index 33757f3..497ebda 100644
--- a/src/prove.c
+++ b/src/prove.c
@@ -265,12 +265,12 @@ static void TEST_mark_syntax_error()
 
     C_output_from_user_input_is(
         "#mark =bar",
-        "#marker must be non-empty.\n",
+        "#mark must be non-empty\n",
         "#mark - empty error");
 
     C_output_from_user_input_is(
         "#mark foo&$foo=bar",
-        "#error: two wildcards (& or $) may not be next to eachother\n",
+        "#mark two wildcards (& or $) may not be next to eachother\n",
         "#mark - two consecutive wildcards");
 }
 
@@ -396,9 +396,9 @@ static void TEST_mark()
 
 static void TEST_substitute_syntax_error()
 {
-    C_output_from_user_input_contains(
+    C_output_from_user_input_is(
         "#substitute = ",
-        "#substitute must be non-empty.",
+        "#substitute must be non-empty\n",
         "#substitute - syntax error");
 }
 
@@ -434,15 +434,18 @@ void prove()
 {
     _is_proving = 1;
 
-    do_test(TEST_tap, "TAP output");
+    int looping = 2;
+    while (looping--) {
+        do_test(TEST_tap, "TAP output");
 
-    do_test(TEST_mark_syntax_error, "#mark syntax");
-    do_test(TEST_mark_reset_step1, "#mark reset step 1");
-    do_test(TEST_mark_reset_step2, "#mark reset step 2");
-    do_test(TEST_mark, "#mark usage");
+        do_test(TEST_mark_syntax_error, "#mark syntax");
+        do_test(TEST_mark_reset_step1, "#mark reset step 1");
+        do_test(TEST_mark_reset_step2, "#mark reset step 2");
+        do_test(TEST_mark, "#mark usage");
 
-    do_test(TEST_substitute_syntax_error, "#substitute syntax error");
-    do_test(TEST_substitute, "#substitute usage");
+        do_test(TEST_substitute_syntax_error, "#substitute syntax error");
+        do_test(TEST_substitute, "#substitute usage");
+    }
 
     done_testing();