Remove needless macro defines and add missing headers

misc/test_runner/include/ia2_test_runner.h

@@ -1,6 +1,9 @@
 #pragma once
 #include <stdio.h>
 #include <stdbool.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <assert.h>
 
 struct fake_criterion_test {
   void (*test)(void);

tests/destructors/main.c

@@ -5,7 +5,7 @@
 #include <unistd.h>
 #include <ia2.h>
 #include "plugin.h"
-#define IA2_DEFINE_TEST_HANDLER
+
 
 
 // This test uses two protection keys

tests/heap_two_keys/main.c

@@ -9,7 +9,7 @@ RUN: sh -c 'if [ ! -s "heap_two_keys_call_gates_0.ld" ]; then echo "No link args
 #include <ia2.h>
 #include <ia2_allocator.h>
 #include "plugin.h"
-#define IA2_DEFINE_TEST_HANDLER
+
 
 
 // This test uses two protection keys

tests/heap_two_keys/plugin.c

@@ -1,6 +1,7 @@
 /*
 RUN: cat heap_two_keys_call_gates_1.ld | FileCheck --check-prefix=LINKARGS %s
 */
+#include <ia2_test_runner.h>
 #include <stdio.h>
 #include <ia2.h>
 #include "exported_fn.h"

tests/mmap_loop/main.c

@@ -8,7 +8,7 @@ RUN: sh -c 'if [ ! -s "mmap_loop_call_gates_0.ld" ]; then echo "No link args as
 #include <stdio.h>
 #include <ia2_test_runner.h>
 
-#define IA2_DEFINE_TEST_HANDLER
+
 
 
 /*

tests/protected_threads/main.c

@@ -7,7 +7,7 @@ RUN: sh -c 'if [ ! -s "protected_threads_call_gates_0.ld" ]; then echo "No link
 #include <pthread.h>
 #include <string.h>
 #include <sys/wait.h>
-#define IA2_DEFINE_TEST_HANDLER
+
 #include <ia2_test_runner.h>
 
 #include <unistd.h>

tests/read_config/main.c

@@ -14,7 +14,7 @@ RUN: cat main.c | FileCheck --match-full-lines --check-prefix=REWRITER %s
 // need wrapped function pointer definitions. For now just hack around this by
 // including plugin.h (which does include the output header) before core.h.
 #include "core.h"
-#define IA2_DEFINE_TEST_HANDLER
+
 
 
 /*

tests/recursion/main.c

@@ -7,7 +7,7 @@ RUN: cat recursion_call_gates_2.ld | FileCheck --check-prefix=LINKARGS %s
 
 #include <ia2.h>
 #include <stdio.h>
-#define IA2_DEFINE_TEST_HANDLER
+
 
 
 INIT_RUNTIME(2);

tests/ro_sharing/main.c

@@ -6,7 +6,7 @@ RUN: sh -c 'if [ ! -s "ro_sharing_call_gates_0.ld" ]; then echo "No link args as
 #include <plugin.h>
 #include <ia2.h>
 #include <stdio.h>
-#define IA2_DEFINE_TEST_HANDLER
+
 
 
 // This test checks that all RO data mapped in from executable files is shared.

tests/should_segfault/main.c

@@ -7,7 +7,7 @@ RUN: sh -c 'if [ ! -s "should_segfault_call_gates_0.ld" ]; then echo "No link ar
 #include <stdint.h>
 #include <print_secret.h>
 #include <ia2.h>
-#define IA2_DEFINE_TEST_HANDLER
+
 
 
 INIT_RUNTIME(1);
@@ -30,4 +30,4 @@ Test(should_segfault, main) {
 Test(should_segfault, early_fault, .exit_code = 255) {
     do_early_fault();
     print_secret();
-}
+}

tests/should_segfault/print_secret.c

@@ -5,6 +5,7 @@ RUN: cat should_segfault_call_gates_1.ld | FileCheck --check-prefix=LINKARGS %s
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdbool.h>
+#include <signal.h>
 #include "print_secret.h"
 
 

tests/sighandler/lib.c

@@ -7,7 +7,7 @@ RUN: cat sighandler_call_gates_1.ld | FileCheck --check-prefix=LINKARGS %s
 #include <ia2.h>
 #include <ia2_test_runner.h>
 
-#define IA2_DEFINE_TEST_HANDLER
+
 
 
 #define IA2_COMPARTMENT 2

tests/sighandler/main.c

@@ -7,7 +7,7 @@ We need this because lib.c uses LINKARGS checks but not this file.
 #include <stddef.h>
 #include <signal.h>
 #include <ia2.h>
-#define IA2_DEFINE_TEST_HANDLER
+
 
 #include <ia2_test_runner.h>
 

tests/threads/main.c

@@ -9,7 +9,7 @@ RUN: sh -c 'if [ ! -s "threads_call_gates_0.ld" ]; then echo "No link args as ex
 #include <pthread.h>
 #include <string.h>
 #include <sys/wait.h>
-#define IA2_DEFINE_TEST_HANDLER
+
 
 #include <unistd.h>
 

tests/three_keys_minimal/main.c

@@ -10,7 +10,7 @@ INIT_RUNTIME(3);
 #include <ia2_compartment_init.inc>
 #include <threads.h>
 
-#define IA2_DEFINE_TEST_HANDLER
+
 
 
 void main_noop(void) {

tests/tls_protected/main.c

@@ -5,7 +5,7 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <unistd.h>
-#define IA2_DEFINE_TEST_HANDLER
+
 
 #include <threads.h>
 

tests/trusted_direct/main.c

@@ -9,7 +9,7 @@ RUN: cat trusted_direct_call_gates_0.ld | FileCheck --check-prefix=LINKARGS %s
 
 #include <ia2.h>
 #include "plugin.h"
-#define IA2_DEFINE_TEST_HANDLER
+
 
 
 // This test checks that an untrusted library can call a trusted main binary. An

tests/trusted_indirect/main.c

@@ -6,7 +6,7 @@ RUN: sh -c 'if [ ! -s "trusted_indirect_call_gates_0.ld" ]; then echo "No link a
 
 #include "rand_op.h"
 #include <ia2.h>
-#define IA2_DEFINE_TEST_HANDLER
+
 
 
 /*

tests/two_keys_minimal/main.c

@@ -11,7 +11,7 @@ RUN: cat two_keys_minimal_call_gates_2.ld | FileCheck --check-prefix=LINKARGS %s
 #include <unistd.h>
 #include <ia2.h>
 #include "plugin.h"
-#define IA2_DEFINE_TEST_HANDLER
+
 
 
 // This test uses two protection keys

tests/two_shared_ranges/main.c

@@ -9,7 +9,7 @@ RUN: cat two_shared_ranges_call_gates_2.ld | FileCheck --check-prefix=LINKARGS %
 #include <unistd.h>
 #include <ia2.h>
 #include "plugin.h"
-#define IA2_DEFINE_TEST_HANDLER
+
 
 
 // This test uses two protection keys

tests/untrusted_indirect/main.c

@@ -6,7 +6,7 @@ RUN: sh -c 'if [ ! -s "untrusted_indirect_call_gates_0.ld" ]; then echo "No link
 #include <stdint.h>
 #include "foo.h"
 #include <ia2.h>
-#define IA2_DEFINE_TEST_HANDLER
+
 
 
 INIT_RUNTIME(1);