nickanderson · Oct 31, 2026 · May 6, 2026 · Jul 24, 2026 · Aug 25, 2026 · Oct 7, 2026
diff --git a/.github/workflows/acceptance_tests.yml b/.github/workflows/acceptance_tests.yml
@@ -20,4 +20,4 @@ jobs:
       run: |
         cd tests/acceptance
         chmod -R go-w .
-        ./testall --printlog --tests=common,errorlog
+        ./testall --printlog --tests=common,errorlog,errorexit,errorpass
diff --git a/.../00_basics/01_compiler/string_contexts.cf → ...01_compiler/string_contexts.error.pass.cf b/.../00_basics/01_compiler/string_contexts.cf → ...01_compiler/string_contexts.error.pass.cf
@@ -1,5 +1,9 @@
 # fixes https://dev.cfengine.com/issues/2504
 # using variables in string contexts
+#
+# This is an .error.pass.cf test, because the 'cf engine' class context
+# (words separated by whitespace without an operator) is invalid on
+# purpose and logs an error.
 body common control
 {
   inputs => { "../../default.sub.cf" };

diff --git a/...compiler/string_contexts.cf.expected.json → ...ring_contexts.error.pass.cf.expected.json b/...compiler/string_contexts.cf.expected.json → ...ring_contexts.error.pass.cf.expected.json
diff --git a/tests/acceptance/00_basics/03_bodies/112.cf → ...nce/00_basics/03_bodies/112.error.pass.cf b/tests/acceptance/00_basics/03_bodies/112.cf → ...nce/00_basics/03_bodies/112.error.pass.cf
diff --git a/tests/acceptance/00_basics/04_bundles/wrong-bundle-type.cf b/tests/acceptance/00_basics/04_bundles/wrong-bundle-type.cf
@@ -20,6 +20,10 @@ bundle agent test
         "${sys.cf_agent} -Kf $(this.promise_dirname)/wrong-bundle-type.sub.x.cf",
         "noshell"
       );
+
+    # Indent the output in the DEBUG report, so that errors printed by the
+    # sub-agent are not mistaken for errors of this test by testall
+    "subout_indented" string => regex_replace($(subout), "^", "  | ", "gm");
 }
 
 bundle agent check
@@ -29,7 +33,7 @@ bundle agent check
 
   reports:
     DEBUG::
-      "$(test.subout)";
+      "$(test.subout_indented)";
 
     ok::
       "$(this.promise_filename) Pass";

diff --git a/...acceptance/00_basics/def.json/augments.cf → ...acceptance/00_basics/def_json/augments.cf b/...acceptance/00_basics/def.json/augments.cf → ...acceptance/00_basics/def_json/augments.cf
diff --git a/...asics/def.json/augments.cf.augmenter.json → ...asics/def_json/augments.cf.augmenter.json b/...asics/def.json/augments.cf.augmenter.json → ...asics/def_json/augments.cf.augmenter.json
diff --git a/...tance/00_basics/def.json/augments.cf.json → ...tance/00_basics/def_json/augments.cf.json b/...tance/00_basics/def.json/augments.cf.json → ...tance/00_basics/def_json/augments.cf.json
diff --git a/...json/augments_classes/augments_classes.cf → ...json/augments_classes/augments_classes.cf b/...json/augments_classes/augments_classes.cf → ...json/augments_classes/augments_classes.cf
diff --git a/...basics/def.json/augments_classes/def.json → ...basics/def_json/augments_classes/def.json b/...basics/def.json/augments_classes/def.json → ...basics/def_json/augments_classes/def.json
diff --git a/...ance/00_basics/def.json/augments_order.cf → ...ance/00_basics/def_json/augments_order.cf b/...ance/00_basics/def.json/augments_order.cf → ...ance/00_basics/def_json/augments_order.cf
diff --git a/...def.json/augments_order.cf.augmenter.json → ...def_json/augments_order.cf.augmenter.json b/...def.json/augments_order.cf.augmenter.json → ...def_json/augments_order.cf.augmenter.json
diff --git a/...00_basics/def.json/augments_order.cf.json → ...00_basics/def_json/augments_order.cf.json b/...00_basics/def.json/augments_order.cf.json → ...00_basics/def_json/augments_order.cf.json
diff --git a/...acceptance/00_basics/def.json/bad-json.cf → ...acceptance/00_basics/def_json/bad-json.cf b/...acceptance/00_basics/def.json/bad-json.cf → ...acceptance/00_basics/def_json/bad-json.cf
diff --git a/...nce/00_basics/def.json/bad-json.cf.x.json → ...nce/00_basics/def_json/bad-json.cf.x.json b/...nce/00_basics/def.json/bad-json.cf.x.json → ...nce/00_basics/def_json/bad-json.cf.x.json
diff --git a/...cs/def.json/class_from_classexpression.cf → ...cs/def_json/class_from_classexpression.cf b/...cs/def.json/class_from_classexpression.cf → ...cs/def_json/class_from_classexpression.cf
diff --git a/...f.json/class_from_classexpression.cf.json → ...f_json/class_from_classexpression.cf.json b/...f.json/class_from_classexpression.cf.json → ...f_json/class_from_classexpression.cf.json
diff --git a/.../acceptance/00_basics/def.json/classes.cf → .../acceptance/00_basics/def_json/classes.cf b/.../acceptance/00_basics/def.json/classes.cf → .../acceptance/00_basics/def_json/classes.cf
diff --git a/...ptance/00_basics/def.json/classes.cf.json → ...ptance/00_basics/def_json/classes.cf.json b/...ptance/00_basics/def.json/classes.cf.json → ...ptance/00_basics/def_json/classes.cf.json
diff --git a/...nce/00_basics/def.json/classes_with_ns.cf → ...nce/00_basics/def_json/classes_with_ns.cf b/...nce/00_basics/def.json/classes_with_ns.cf → ...nce/00_basics/def_json/classes_with_ns.cf
diff --git a/...0_basics/def.json/classes_with_ns.cf.json → ...0_basics/def_json/classes_with_ns.cf.json b/...0_basics/def.json/classes_with_ns.cf.json → ...0_basics/def_json/classes_with_ns.cf.json
diff --git a/...0_basics/def.json/classes_with_ns_tags.cf → ...0_basics/def_json/classes_with_ns_tags.cf b/...0_basics/def.json/classes_with_ns_tags.cf → ...0_basics/def_json/classes_with_ns_tags.cf
diff --git a/...ics/def.json/classes_with_ns_tags.cf.json → ...ics/def_json/classes_with_ns_tags.cf.json b/...ics/def.json/classes_with_ns_tags.cf.json → ...ics/def_json/classes_with_ns_tags.cf.json
diff --git a/...nd-variables-keys/both-can-define-vars.cf → ...nd-variables-keys/both-can-define-vars.cf b/...nd-variables-keys/both-can-define-vars.cf → ...nd-variables-keys/both-can-define-vars.cf
diff --git a/...ncurrent-vars-and-variables-keys/def.json → ...ncurrent-vars-and-variables-keys/def.json b/...ncurrent-vars-and-variables-keys/def.json → ...ncurrent-vars-and-variables-keys/def.json
diff --git a/...bles-wins-variables-listed-first/def.json → ...bles-wins-variables-listed-first/def.json b/...bles-wins-variables-listed-first/def.json → ...bles-wins-variables-listed-first/def.json
diff --git a/...-variables-listed-first/variables-wins.cf → ...-variables-listed-first/variables-wins.cf b/...-variables-listed-first/variables-wins.cf → ...-variables-listed-first/variables-wins.cf
diff --git a/...vars-and-variables-keys/variables-wins.cf → ...vars-and-variables-keys/variables-wins.cf b/...vars-and-variables-keys/variables-wins.cf → ...vars-and-variables-keys/variables-wins.cf
diff --git a/tests/acceptance/00_basics/def.json/def.json → tests/acceptance/00_basics/def_json/def.json b/tests/acceptance/00_basics/def.json/def.json → tests/acceptance/00_basics/def_json/def.json
diff --git a/...sics/def.json/def_preferred.json/def.json → ...sics/def_json/def_preferred.json/def.json b/...sics/def.json/def_preferred.json/def.json → ...sics/def_json/def_preferred.json/def.json
diff --git a/....json/def_preferred.json/def_preferred.cf → ..._json/def_preferred.json/def_preferred.cf b/....json/def_preferred.json/def_preferred.cf → ..._json/def_preferred.json/def_preferred.cf
diff --git a/...son/def_preferred.json/def_preferred.json → ...son/def_preferred.json/def_preferred.json b/...son/def_preferred.json/def_preferred.json → ...son/def_preferred.json/def_preferred.json
diff --git a/...s/acceptance/00_basics/def.json/inputs.cf → ...s/acceptance/00_basics/def_json/inputs.cf b/...s/acceptance/00_basics/def.json/inputs.cf → ...s/acceptance/00_basics/def_json/inputs.cf
diff --git a/...eptance/00_basics/def.json/inputs.cf.json → ...eptance/00_basics/def_json/inputs.cf.json b/...eptance/00_basics/def.json/inputs.cf.json → ...eptance/00_basics/def_json/inputs.cf.json
diff --git a/..._basics/def.json/json-inputs-not-array.cf → ..._basics/def_json/json-inputs-not-array.cf b/..._basics/def.json/json-inputs-not-array.cf → ..._basics/def_json/json-inputs-not-array.cf
diff --git a/...cs/def.json/json-inputs-not-array.cf.json → ...cs/def_json/json-inputs-not-array.cf.json b/...cs/def.json/json-inputs-not-array.cf.json → ...cs/def_json/json-inputs-not-array.cf.json
diff --git a/.../def.json/json-inputs-not-auto-applied.cf → .../def_json/json-inputs-not-auto-applied.cf b/.../def.json/json-inputs-not-auto-applied.cf → .../def_json/json-inputs-not-auto-applied.cf
diff --git a/...json/json-inputs-not-auto-applied.cf.json → ...json/json-inputs-not-auto-applied.cf.json b/...json/json-inputs-not-auto-applied.cf.json → ...json/json-inputs-not-auto-applied.cf.json
diff --git a/..._basics/def.json/policy_server_classes.cf → ..._basics/def_json/policy_server_classes.cf b/..._basics/def.json/policy_server_classes.cf → ..._basics/def_json/policy_server_classes.cf
diff --git a/...cs/def.json/policy_server_classes.cf.json → ...cs/def_json/policy_server_classes.cf.json b/...cs/def.json/policy_server_classes.cf.json → ...cs/def_json/policy_server_classes.cf.json
diff --git a/...ance/00_basics/def.json/show_vars_JSON.cf → ...ance/00_basics/def_json/show_vars_JSON.cf b/...ance/00_basics/def.json/show_vars_JSON.cf → ...ance/00_basics/def_json/show_vars_JSON.cf
diff --git a/...00_basics/def.json/show_vars_JSON.cf.json → ...00_basics/def_json/show_vars_JSON.cf.json b/...00_basics/def.json/show_vars_JSON.cf.json → ...00_basics/def_json/show_vars_JSON.cf.json
diff --git a/tests/acceptance/00_basics/def.json/state.cf → tests/acceptance/00_basics/def_json/state.cf b/tests/acceptance/00_basics/def.json/state.cf → tests/acceptance/00_basics/def_json/state.cf
diff --git a/...00_basics/def.json/state.cf.expected.json → ...00_basics/def_json/state.cf.expected.json b/...00_basics/def.json/state.cf.expected.json → ...00_basics/def_json/state.cf.expected.json
diff --git a/...cceptance/00_basics/def.json/variables.cf → ...cceptance/00_basics/def_json/variables.cf b/...cceptance/00_basics/def.json/variables.cf → ...cceptance/00_basics/def_json/variables.cf
diff --git a/...ance/00_basics/def.json/variables.cf.json → ...ance/00_basics/def_json/variables.cf.json b/...ance/00_basics/def.json/variables.cf.json → ...ance/00_basics/def_json/variables.cf.json
diff --git a/...0_basics/def.json/variables_bare_array.cf → ...0_basics/def_json/variables_bare_array.cf b/...0_basics/def.json/variables_bare_array.cf → ...0_basics/def_json/variables_bare_array.cf
diff --git a/...ics/def.json/variables_bare_array.cf.json → ...ics/def_json/variables_bare_array.cf.json b/...ics/def.json/variables_bare_array.cf.json → ...ics/def_json/variables_bare_array.cf.json
diff --git a/..._basics/def.json/variables_bare_string.cf → ..._basics/def_json/variables_bare_string.cf b/..._basics/def.json/variables_bare_string.cf → ..._basics/def_json/variables_bare_string.cf
diff --git a/...cs/def.json/variables_bare_string.cf.json → ...cs/def_json/variables_bare_string.cf.json b/...cs/def.json/variables_bare_string.cf.json → ...cs/def_json/variables_bare_string.cf.json
diff --git a/..._basics/def.json/variables_with_bundle.cf → ..._basics/def_json/variables_with_bundle.cf b/..._basics/def.json/variables_with_bundle.cf → ..._basics/def_json/variables_with_bundle.cf
diff --git a/...cs/def.json/variables_with_bundle.cf.json → ...cs/def_json/variables_with_bundle.cf.json b/...cs/def.json/variables_with_bundle.cf.json → ...cs/def_json/variables_with_bundle.cf.json
diff --git a/...e/00_basics/def.json/variables_with_ns.cf → ...e/00_basics/def_json/variables_with_ns.cf b/...e/00_basics/def.json/variables_with_ns.cf → ...e/00_basics/def_json/variables_with_ns.cf
diff --git a/...basics/def.json/variables_with_ns.cf.json → ...basics/def_json/variables_with_ns.cf.json b/...basics/def.json/variables_with_ns.cf.json → ...basics/def_json/variables_with_ns.cf.json
diff --git a/tests/acceptance/00_basics/def.json/vars.cf → tests/acceptance/00_basics/def_json/vars.cf b/tests/acceptance/00_basics/def.json/vars.cf → tests/acceptance/00_basics/def_json/vars.cf
diff --git a/...cceptance/00_basics/def.json/vars.cf.json → ...cceptance/00_basics/def_json/vars.cf.json b/...cceptance/00_basics/def.json/vars.cf.json → ...cceptance/00_basics/def_json/vars.cf.json
diff --git a/...ce/00_basics/def.json/vars_with_bundle.cf → ...ce/00_basics/def_json/vars_with_bundle.cf b/...ce/00_basics/def.json/vars_with_bundle.cf → ...ce/00_basics/def_json/vars_with_bundle.cf
diff --git a/..._basics/def.json/vars_with_bundle.cf.json → ..._basics/def_json/vars_with_bundle.cf.json b/..._basics/def.json/vars_with_bundle.cf.json → ..._basics/def_json/vars_with_bundle.cf.json
diff --git a/...ptance/00_basics/def.json/vars_with_ns.cf → ...ptance/00_basics/def_json/vars_with_ns.cf b/...ptance/00_basics/def.json/vars_with_ns.cf → ...ptance/00_basics/def_json/vars_with_ns.cf
diff --git a/...e/00_basics/def.json/vars_with_ns.cf.json → ...e/00_basics/def_json/vars_with_ns.cf.json b/...e/00_basics/def.json/vars_with_ns.cf.json → ...e/00_basics/def_json/vars_with_ns.cf.json
diff --git a/tests/acceptance/01_vars/01_basic/013.cf → ...ptance/01_vars/01_basic/013.error.pass.cf b/tests/acceptance/01_vars/01_basic/013.cf → ...ptance/01_vars/01_basic/013.error.pass.cf
@@ -2,6 +2,10 @@
 #
 # Test that 'classes' body works on 'vars' promises
 #
+# This is an .error.pass.cf test, because execresult() of the
+# non-existent '/nonexisting' fails on purpose and logs errors, to test
+# that repair_failed classes are set.
+#
 #######################################################
 body common control
 {

diff --git a/...not_define_variables_in_remote_bundles.cf → ...variables_in_remote_bundles.error.pass.cf b/...not_define_variables_in_remote_bundles.cf → ...variables_in_remote_bundles.error.pass.cf
@@ -2,6 +2,10 @@
 #
 # Test that it is invalid to define variables in remote bundles
 #
+# This is an .error.pass.cf test, because defining a variable in a
+# remote bundle is rejected with errors, which is what this test checks
+# (CFE-1915).
+#
 #######################################################
 body common control
 {

diff --git a/tests/acceptance/01_vars/01_basic/this_promiser_with_readjson.cf b/tests/acceptance/01_vars/01_basic/this_promiser_with_readjson.cf
@@ -26,7 +26,8 @@ bundle agent test
 {
   vars:
     "cf_promises_validated"
-      data => readjson("$(G.testfile).$(this.promiser)", 1K);
+      data => readjson("$(G.testfile).$(this.promiser)", 1K),
+      if => fileexists("$(G.testfile).$(this.promiser)");
 
     "printable" string => format("%S", "cf_promises_validated");
 

diff --git a/tests/acceptance/01_vars/02_functions/006.cf → ...ce/01_vars/02_functions/006.error.pass.cf b/tests/acceptance/01_vars/02_functions/006.cf → ...ce/01_vars/02_functions/006.error.pass.cf
@@ -2,6 +2,9 @@
 #
 # Test diskfree()
 #
+# This is an .error.pass.cf test, because diskfree() is called on the
+# non-existent path '/lkjqeroiu' on purpose and logs an error.
+#
 #######################################################
 body common control
 {

diff --git a/tests/acceptance/01_vars/02_functions/011.cf b/tests/acceptance/01_vars/02_functions/011.cf
@@ -37,7 +37,10 @@ body delete init_delete
 bundle agent test
 {
   vars:
-    "nums" slist => readstringlist("$(G.testfile)", "NoComment", "\s+", 5, 100);
+    "nums"
+      slist => readstringlist("$(G.testfile)", "NoComment", "\s+", 5, 100),
+      if => fileexists("$(G.testfile)");
+
     "sum" real => sum("nums");
 }
 

diff --git a/tests/acceptance/01_vars/02_functions/012.cf b/tests/acceptance/01_vars/02_functions/012.cf
@@ -38,7 +38,10 @@ body delete init_delete
 bundle agent test
 {
   vars:
-    "nums" slist => readstringlist("$(G.testfile)", "NoComment", "\s+", 5, 100);
+    "nums"
+      slist => readstringlist("$(G.testfile)", "NoComment", "\s+", 5, 100),
+      if => fileexists("$(G.testfile)");
+
     "sum" real => sum("nums");
 }
 

diff --git a/tests/acceptance/01_vars/02_functions/013.cf b/tests/acceptance/01_vars/02_functions/013.cf
@@ -37,7 +37,10 @@ body delete init_delete
 bundle agent test
 {
   vars:
-    "nums" slist => readstringlist("$(G.testfile)", "NoComment", "\s+", 5, 100);
+    "nums"
+      slist => readstringlist("$(G.testfile)", "NoComment", "\s+", 5, 100),
+      if => fileexists("$(G.testfile)");
+
     "sum" real => sum("nums");
 }
 

diff --git a/tests/acceptance/01_vars/02_functions/014.cf b/tests/acceptance/01_vars/02_functions/014.cf
@@ -37,7 +37,10 @@ body delete init_delete
 bundle agent test
 {
   vars:
-    "nums" slist => readstringlist("$(G.testfile)", "NoComment", "\.", 5, 100);
+    "nums"
+      slist => readstringlist("$(G.testfile)", "NoComment", "\.", 5, 100),
+      if => fileexists("$(G.testfile)");
+
     "sum" real => sum("nums");
 }
 

diff --git a/tests/acceptance/01_vars/02_functions/015.cf b/tests/acceptance/01_vars/02_functions/015.cf
@@ -37,7 +37,10 @@ body delete init_delete
 bundle agent test
 {
   vars:
-    "nums" slist => readstringlist("$(G.testfile)", "NoComment", "\s+", 5, 100);
+    "nums"
+      slist => readstringlist("$(G.testfile)", "NoComment", "\s+", 5, 100),
+      if => fileexists("$(G.testfile)");
+
     "sum" real => sum("nums");
 }
 

diff --git a/tests/acceptance/01_vars/02_functions/016.cf b/tests/acceptance/01_vars/02_functions/016.cf
@@ -38,7 +38,10 @@ body delete init_delete
 bundle agent test
 {
   vars:
-    "nums" slist => readstringlist("$(G.testfile)", "NoComment", "\s+", 5, 100);
+    "nums"
+      slist => readstringlist("$(G.testfile)", "NoComment", "\s+", 5, 100),
+      if => fileexists("$(G.testfile)");
+
     "sum" real => sum("nums");
 }
 

diff --git a/tests/acceptance/01_vars/02_functions/017.cf b/tests/acceptance/01_vars/02_functions/017.cf
@@ -38,7 +38,10 @@ body delete init_delete
 bundle agent test
 {
   vars:
-    "nums" slist => readstringlist("$(G.testfile)", "NoComment", "\s+", 5, 100);
+    "nums"
+      slist => readstringlist("$(G.testfile)", "NoComment", "\s+", 5, 100),
+      if => fileexists("$(G.testfile)");
+
     "sum" real => sum("nums");
 }
 

diff --git a/tests/acceptance/01_vars/02_functions/018.cf b/tests/acceptance/01_vars/02_functions/018.cf
@@ -37,7 +37,10 @@ body delete init_delete
 bundle agent test
 {
   vars:
-    "nums" slist => readstringlist("$(G.testfile)", "NoComment", "\s+", 5, 100);
+    "nums"
+      slist => readstringlist("$(G.testfile)", "NoComment", "\s+", 5, 100),
+      if => fileexists("$(G.testfile)");
+
     "sum" real => sum("nums");
 }
 

diff --git a/tests/acceptance/01_vars/02_functions/019.cf b/tests/acceptance/01_vars/02_functions/019.cf
@@ -37,7 +37,10 @@ body delete init_delete
 bundle agent test
 {
   vars:
-    "nums" slist => readstringlist("$(G.testfile)", "NoComment", "X", 5, 100);
+    "nums"
+      slist => readstringlist("$(G.testfile)", "NoComment", "X", 5, 100),
+      if => fileexists("$(G.testfile)");
+
     "sum" real => sum("nums");
 }
 

diff --git a/tests/acceptance/01_vars/02_functions/020.cf b/tests/acceptance/01_vars/02_functions/020.cf
@@ -37,7 +37,10 @@ body delete init_delete
 bundle agent test
 {
   vars:
-    "nums" slist => readstringlist("$(G.testfile)", "NoComment", "\s", 5, 100);
+    "nums"
+      slist => readstringlist("$(G.testfile)", "NoComment", "\s", 5, 100),
+      if => fileexists("$(G.testfile)");
+
     "sum" real => sum("nums");
 }
 

diff --git a/tests/acceptance/01_vars/02_functions/021.cf b/tests/acceptance/01_vars/02_functions/021.cf
@@ -37,7 +37,10 @@ body delete init_delete
 bundle agent test
 {
   vars:
-    "nums" slist => readstringlist("$(G.testfile)", "NoComment", ",", 5, 100);
+    "nums"
+      slist => readstringlist("$(G.testfile)", "NoComment", ",", 5, 100),
+      if => fileexists("$(G.testfile)");
+
     "sum" real => sum("nums");
 }
 

diff --git a/tests/acceptance/01_vars/02_functions/024.cf b/tests/acceptance/01_vars/02_functions/024.cf
@@ -36,7 +36,10 @@ body delete init_delete
 bundle agent test
 {
   vars:
-    "nums" ilist => readintlist("$(G.testfile)", "NoComment", "\s+", 5, 100);
+    "nums"
+      ilist => readintlist("$(G.testfile)", "NoComment", "\s+", 5, 100),
+      if => fileexists("$(G.testfile)");
+
     "sum" real => sum("nums");
 }
 

diff --git a/tests/acceptance/01_vars/02_functions/025.cf b/tests/acceptance/01_vars/02_functions/025.cf
@@ -37,7 +37,10 @@ body delete init_delete
 bundle agent test
 {
   vars:
-    "nums" ilist => readintlist("$(G.testfile)", "NoComment", "\s+", 5, 100);
+    "nums"
+      ilist => readintlist("$(G.testfile)", "NoComment", "\s+", 5, 100),
+      if => fileexists("$(G.testfile)");
+
     "sum" real => sum("nums");
 }
 

diff --git a/tests/acceptance/01_vars/02_functions/026.cf b/tests/acceptance/01_vars/02_functions/026.cf
@@ -36,7 +36,10 @@ body delete init_delete
 bundle agent test
 {
   vars:
-    "nums" ilist => readintlist("$(G.testfile)", "NoComment", "\s+", 5, 100);
+    "nums"
+      ilist => readintlist("$(G.testfile)", "NoComment", "\s+", 5, 100),
+      if => fileexists("$(G.testfile)");
+
     "sum" real => sum("nums");
 }
 

diff --git a/tests/acceptance/01_vars/02_functions/027.cf b/tests/acceptance/01_vars/02_functions/027.cf
@@ -36,7 +36,10 @@ body delete init_delete
 bundle agent test
 {
   vars:
-    "nums" ilist => readintlist("$(G.testfile)", "NoComment", "\.", 5, 100);
+    "nums"
+      ilist => readintlist("$(G.testfile)", "NoComment", "\.", 5, 100),
+      if => fileexists("$(G.testfile)");
+
     "sum" real => sum("nums");
 }
 

diff --git a/tests/acceptance/01_vars/02_functions/028.cf b/tests/acceptance/01_vars/02_functions/028.cf
@@ -36,7 +36,10 @@ body delete init_delete
 bundle agent test
 {
   vars:
-    "nums" ilist => readintlist("$(G.testfile)", "NoComment", "\s+", 5, 100);
+    "nums"
+      ilist => readintlist("$(G.testfile)", "NoComment", "\s+", 5, 100),
+      if => fileexists("$(G.testfile)");
+
     "sum" real => sum("nums");
 }
 

diff --git a/tests/acceptance/01_vars/02_functions/029.cf b/tests/acceptance/01_vars/02_functions/029.cf
@@ -37,7 +37,10 @@ body delete init_delete
 bundle agent test
 {
   vars:
-    "nums" ilist => readintlist("$(G.testfile)", "NoComment", "\s+", 5, 100);
+    "nums"
+      ilist => readintlist("$(G.testfile)", "NoComment", "\s+", 5, 100),
+      if => fileexists("$(G.testfile)");
+
     "sum" real => sum("nums");
 }
 

diff --git a/tests/acceptance/01_vars/02_functions/030.cf b/tests/acceptance/01_vars/02_functions/030.cf
@@ -37,7 +37,10 @@ body delete init_delete
 bundle agent test
 {
   vars:
-    "nums" ilist => readintlist("$(G.testfile)", "NoComment", "\s+", 5, 100);
+    "nums"
+      ilist => readintlist("$(G.testfile)", "NoComment", "\s+", 5, 100),
+      if => fileexists("$(G.testfile)");
+
     "sum" real => sum("nums");
 }
 

diff --git a/tests/acceptance/01_vars/02_functions/031.cf b/tests/acceptance/01_vars/02_functions/031.cf
@@ -36,7 +36,10 @@ body delete init_delete
 bundle agent test
 {
   vars:
-    "nums" ilist => readintlist("$(G.testfile)", "NoComment", "\s+", 5, 100);
+    "nums"
+      ilist => readintlist("$(G.testfile)", "NoComment", "\s+", 5, 100),
+      if => fileexists("$(G.testfile)");
+
     "sum" real => sum("nums");
 }
 

diff --git a/tests/acceptance/01_vars/02_functions/032.cf b/tests/acceptance/01_vars/02_functions/032.cf
@@ -36,7 +36,10 @@ body delete init_delete
 bundle agent test
 {
   vars:
-    "nums" ilist => readintlist("$(G.testfile)", "NoComment", "X", 5, 100);
+    "nums"
+      ilist => readintlist("$(G.testfile)", "NoComment", "X", 5, 100),
+      if => fileexists("$(G.testfile)");
+
     "sum" real => sum("nums");
 }
 

diff --git a/tests/acceptance/01_vars/02_functions/033.cf b/tests/acceptance/01_vars/02_functions/033.cf
@@ -36,7 +36,10 @@ body delete init_delete
 bundle agent test
 {
   vars:
-    "nums" ilist => readintlist("$(G.testfile)", "NoComment", "\s", 5, 100);
+    "nums"
+      ilist => readintlist("$(G.testfile)", "NoComment", "\s", 5, 100),
+      if => fileexists("$(G.testfile)");
+
     "sum" real => sum("nums");
 }
 

diff --git a/tests/acceptance/01_vars/02_functions/034.cf b/tests/acceptance/01_vars/02_functions/034.cf
@@ -36,7 +36,10 @@ body delete init_delete
 bundle agent test
 {
   vars:
-    "nums" ilist => readintlist("$(G.testfile)", "NoComment", ",", 5, 100);
+    "nums"
+      ilist => readintlist("$(G.testfile)", "NoComment", ",", 5, 100),
+      if => fileexists("$(G.testfile)");
+
     "sum" real => sum("nums");
 }
 

diff --git a/tests/acceptance/01_vars/02_functions/037.cf b/tests/acceptance/01_vars/02_functions/037.cf
@@ -36,7 +36,10 @@ body delete init_delete
 bundle agent test
 {
   vars:
-    "nums" rlist => readreallist("$(G.testfile)", "NoComment", "\s+", 5, 100);
+    "nums"
+      rlist => readreallist("$(G.testfile)", "NoComment", "\s+", 5, 100),
+      if => fileexists("$(G.testfile)");
+
     "sum" real => sum("nums");
 }
 

diff --git a/tests/acceptance/01_vars/02_functions/038.cf b/tests/acceptance/01_vars/02_functions/038.cf
@@ -37,7 +37,10 @@ body delete init_delete
 bundle agent test
 {
   vars:
-    "nums" rlist => readreallist("$(G.testfile)", "NoComment", "\s+", 5, 100);
+    "nums"
+      rlist => readreallist("$(G.testfile)", "NoComment", "\s+", 5, 100),
+      if => fileexists("$(G.testfile)");
+
     "sum" real => sum("nums");
 }
 

diff --git a/tests/acceptance/01_vars/02_functions/039.cf b/tests/acceptance/01_vars/02_functions/039.cf
@@ -36,7 +36,10 @@ body delete init_delete
 bundle agent test
 {
   vars:
-    "nums" rlist => readreallist("$(G.testfile)", "NoComment", "\s+", 5, 100);
+    "nums"
+      rlist => readreallist("$(G.testfile)", "NoComment", "\s+", 5, 100),
+      if => fileexists("$(G.testfile)");
+
     "sum" real => sum("nums");
 }
 

diff --git a/tests/acceptance/01_vars/02_functions/040.cf b/tests/acceptance/01_vars/02_functions/040.cf
@@ -36,7 +36,10 @@ body delete init_delete
 bundle agent test
 {
   vars:
-    "nums" rlist => readreallist("$(G.testfile)", "NoComment", "\.", 5, 100);
+    "nums"
+      rlist => readreallist("$(G.testfile)", "NoComment", "\.", 5, 100),
+      if => fileexists("$(G.testfile)");
+
     "sum" real => sum("nums");
 }