From 414b8f4e103bd6112001fe140cfb3b32c97e8bb5 Mon Sep 17 00:00:00 2001
From: Robert Norton
Date: Wed, 19 Jun 2019 17:04:31 +0100
Subject: Make C emulator exit with failure for uncaught exception. Make
 special case for 'exception.sail' test that deliberately exits with uncaught
 exception.

---
 src/jib/c_backend.ml | 6 +++---
 test/c/run_tests.py  | 6 +++---
 test/sailtest.py     | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/jib/c_backend.ml b/src/jib/c_backend.ml
index 242f31b2..c06a5494 100644
--- a/src/jib/c_backend.ml
+++ b/src/jib/c_backend.ml
@@ -2186,7 +2186,7 @@ let compile_ast env output_chan c_includes ast =
            "  CREATE(zexception)(current_exception);" ],
          [ "  KILL(zexception)(current_exception);";
            "  free(current_exception);";
-           "  if (have_exception) fprintf(stderr, \"Exiting due to uncaught exception\\n\");" ])
+           "  if (have_exception) {fprintf(stderr, \"Exiting due to uncaught exception\\n\"); exit(EXIT_FAILURE);}" ])
     in
 
     let letbind_initializers =
@@ -2231,9 +2231,9 @@ let compile_ast env output_chan c_includes ast =
        @ letbind_finalizers
        @ List.concat (List.map (fun r -> snd (register_init_clear r)) regs)
        @ finish cdefs
+       @ [ "  cleanup_rts();" ]
        @ snd exn_boilerplate
-       @ [ "  cleanup_rts();";
-           "}" ] ))
+       @ [ "}" ] ))
     in
 
     let model_default_main = separate hardline (List.map string
diff --git a/test/c/run_tests.py b/test/c/run_tests.py
index f5347831..64c3ae42 100755
--- a/test/c/run_tests.py
+++ b/test/c/run_tests.py
@@ -22,10 +22,10 @@ def test_c(name, c_opts, sail_opts, valgrind):
             if tests[filename] == 0:
                 step('sail -no_warn -c {} {} 1> {}.c'.format(sail_opts, filename, basename))
                 step('gcc {} {}.c {}/lib/*.c -lgmp -lz -I {}/lib -o {}'.format(c_opts, basename, sail_dir, sail_dir, basename))
-                step('./{} 1> {}.result'.format(basename, basename))
+                step('./{} 1> {}.result'.format(basename, basename), expected_status = 1 if basename == "exception" else 0)
                 step('diff {}.result {}.expect'.format(basename, basename))
                 if valgrind:
-                    step("valgrind --leak-check=full --track-origins=yes --errors-for-leak-kinds=all --error-exitcode=1 ./{}".format(basename))
+                    step("valgrind --leak-check=full --track-origins=yes --errors-for-leak-kinds=all --error-exitcode=2 ./{}".format(basename), expected_status = 1 if basename == "exception" else 0)
                 print '{} {}{}{}'.format(filename, color.PASS, 'ok', color.END)
                 sys.exit()
         results.collect(tests)
@@ -57,7 +57,7 @@ def test_ocaml(name):
             tests[filename] = os.fork()
             if tests[filename] == 0:
                 step('sail -ocaml -ocaml_build_dir _sbuild_{} -o {} {}'.format(basename, basename, filename))
-                step('./{} 1> {}.oresult'.format(basename, basename))
+                step('./{} 1> {}.oresult'.format(basename, basename), expected_status = 1 if basename == "exception" else 0)
                 step('diff {}.oresult {}.expect'.format(basename, basename))
                 print '{} {}{}{}'.format(filename, color.PASS, 'ok', color.END)
                 sys.exit()
diff --git a/test/sailtest.py b/test/sailtest.py
index 6910d522..36568469 100644
--- a/test/sailtest.py
+++ b/test/sailtest.py
@@ -30,11 +30,11 @@ def chunks(filenames, cores):
     ys.append(list(chunk))
     return ys
 
-def step(string):
+def step(string, expected_status=0):
     p = subprocess.Popen(string, shell=True, stderr=subprocess.PIPE, stdout=subprocess.PIPE)
     out, err = p.communicate()
     status = p.wait()
-    if status != 0:
+    if status != expected_status:
         print("{}Failed{}: {}".format(color.FAIL, color.END, string))
         print('{}stdout{}:'.format(color.NOTICE, color.END))
         print(out)
-- 
cgit v1.2.3