Replace criterion with test runner on x86

immunant · Oct 17, 2024 · 1f8a394 · 1f8a394
1 parent 7afbed0
commit 1f8a394
Show file tree

Hide file tree

Showing 62 changed files with 117 additions and 116 deletions.
diff --git a/cmake/define-test.cmake b/cmake/define-test.cmake
@@ -137,7 +137,7 @@ function(define_test)
 
     set(ADD_SANDBOX_DEP FALSE)
     if (DEFINE_TEST_CRITERION_TEST)
-        list(APPEND DEFINE_TEST_UNWRAPPED_LIBS criterion)
+        list(APPEND DEFINE_TEST_UNWRAPPED_LIBS ia2_test_runner)
         if (NOT DEFINE_TEST_NOT_IN_CHECK_IA2)
             if (LIBIA2_AARCH64)
                 # unless natively AArch64, default to running tests with qemu-aarch64 and a custom LD_LIBRARY_PATH

diff --git a/cmake/ia2.cmake b/cmake/ia2.cmake
@@ -43,13 +43,8 @@ function(add_ia2_compartment NAME TYPE)
     add_library(${NAME} SHARED)
   endif()
 
-  # The x86 version is missing a dependency here and libs rely on include path overlap to pick up
-  # criterion header. I want to keep spoofed criterion static for simplicity so we add the -I
-  # directly here.
-  if (LIBIA2_AARCH64)
-    target_include_directories(${NAME} PRIVATE
-        ${CMAKE_SOURCE_DIR}/misc/spoofed_criterion/include)
-  endif()
+  target_include_directories(${NAME} PRIVATE
+      ${CMAKE_SOURCE_DIR}/misc/test_runner/include)
   target_compile_definitions(${NAME} PRIVATE
     IA2_ENABLE=1
     PKEY=${ARG_PKEY}
@@ -153,10 +148,11 @@ function(create_compile_commands NAME TYPE)
   # Copy target properties from the real target. We might need to add more properties.
   target_link_libraries(${COMPILE_COMMAND_TARGET} PRIVATE $<TARGET_PROPERTY:${NAME},LINK_LIBRARIES>)
   target_include_directories(${COMPILE_COMMAND_TARGET} PRIVATE ${INCLUDE_DIRECTORIES})
-  if (LIBIA2_AARCH64)
-    target_include_directories(${COMPILE_COMMAND_TARGET} PRIVATE
-        ${CMAKE_SOURCE_DIR}/misc/spoofed_criterion/include)
-  endif()
+  # The test runner is a static library that just defines main so we don't link it into
+  # the libraries defined by tests and instead just add the include flags for its
+  # assertions
+  target_include_directories(${COMPILE_COMMAND_TARGET} PRIVATE
+      ${CMAKE_SOURCE_DIR}/misc/test_runner/include)
   set(CMAKE_EXPORT_COMPILE_COMMANDS OFF)
 endfunction()
 

diff --git a/misc/CMakeLists.txt b/misc/CMakeLists.txt
@@ -1,3 +1 @@
-if (LIBIA2_AARCH64)
-    add_subdirectory(spoofed_criterion)
-endif()
+add_subdirectory(test_runner)
diff --git a/misc/spoofed_criterion/CMakeLists.txt b/misc/spoofed_criterion/CMakeLists.txt
diff --git a/misc/spoofed_criterion/include/criterion/logging.h b/misc/spoofed_criterion/include/criterion/logging.h
diff --git a/misc/spoofed_criterion/include/criterion/new/assert.h b/misc/spoofed_criterion/include/criterion/new/assert.h
diff --git a/misc/test_runner/CMakeLists.txt b/misc/test_runner/CMakeLists.txt
@@ -0,0 +1,3 @@
+add_library(ia2_test_runner STATIC test_runner.c)
+target_include_directories(ia2_test_runner
+    PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include)
diff --git a/...d_criterion/include/criterion/criterion.h → misc/test_runner/include/ia2_test_runner.h b/...d_criterion/include/criterion/criterion.h → misc/test_runner/include/ia2_test_runner.h
@@ -1,5 +1,5 @@
-#include <criterion/logging.h>
-#include <criterion/new/assert.h>
+#pragma once
+#include <stdio.h>
 
 struct fake_criterion_test {
   void (*test)(void);
@@ -13,3 +13,15 @@ struct fake_criterion_test {
       .test = fake_criterion_##suite##_##name,                                                                                 \
       ##__VA_ARGS__};                                                                                                          \
   void fake_criterion_##suite##_##name(void)
+
+#define cr_log_info(f, ...) printf(f "\n", ##__VA_ARGS__)
+#define cr_log_error(f, ...) fprintf(stderr, f "\n", ##__VA_ARGS__)
+
+#define cr_assert assert
+#define cr_assert_eq(a, b) cr_assert((a) == (b))
+#define cr_assert_lt(a, b) cr_assert((a) < (b))
+#define cr_fatal(s)          \
+  do {                       \
+    fprintf(stderr, s "\n"); \
+    exit(1);                 \
+  } while (0)
diff --git a/misc/spoofed_criterion/test_runner.c → misc/test_runner/test_runner.c b/misc/spoofed_criterion/test_runner.c → misc/test_runner/test_runner.c
@@ -1,4 +1,4 @@
-#include "include/criterion/criterion.h"
+#include "include/ia2_test_runner.h"
 #include <stdbool.h>
 #include <stdio.h>
 #include <sys/wait.h>

diff --git a/tests/abi/abi.c b/tests/abi/abi.c
@@ -3,7 +3,7 @@ RUN: cat minimal_call_gates_1.ld | FileCheck --check-prefix=LINKARGS %s
 */
 
 #include "abi.h"
-#include <criterion/criterion.h>
+#include <ia2_test_runner.h>
 
 // LINKARGS: --wrap=arg1
 void arg1(int x) {

diff --git a/tests/abi/main.c b/tests/abi/main.c
@@ -4,7 +4,7 @@ RUN: sh -c 'if [ ! -s "minimal_call_gates_0.ld" ]; then echo "No link args as ex
 
 // Check that readelf shows exactly one executable segment
 
-#include <criterion/criterion.h>
+#include <ia2_test_runner.h>
 #include "abi.h"
 #include <ia2.h>
 

diff --git a/tests/destructors/main.c b/tests/destructors/main.c
@@ -1,5 +1,5 @@
-#include <criterion/criterion.h>
-#include <criterion/logging.h>
+#include <ia2_test_runner.h>
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>

diff --git a/tests/destructors/plugin.c b/tests/destructors/plugin.c
@@ -1,5 +1,5 @@
-#include <criterion/criterion.h>
-#include <criterion/logging.h>
+#include <ia2_test_runner.h>
+
 #include <stdio.h>
 #include <ia2.h>
 #include "exported_fn.h"

diff --git a/tests/global_fn_ptr/main.c b/tests/global_fn_ptr/main.c
@@ -3,7 +3,7 @@ RUN: sh -c 'if [ ! -s "global_fn_ptr_call_gates_0.ld" ]; then echo "No link args
 */
 #include "operations.h"
 #include <ia2.h>
-#include <criterion/criterion.h>
+#include <ia2_test_runner.h>
 
 uint32_t add(uint32_t x, uint32_t y) { return x + y; }
 uint16_t sub(uint16_t x, uint16_t y) { return x - y; }

diff --git a/tests/global_fn_ptr/operations.c b/tests/global_fn_ptr/operations.c
@@ -2,7 +2,7 @@
 RUN: cat global_fn_ptr_call_gates_1.ld | FileCheck --check-prefix=LINKARGS %s
 */
 #include "operations.h"
-#include <criterion/criterion.h>
+#include <ia2_test_runner.h>
 #include <stdio.h>
 
 extern Op operations[2];

diff --git a/tests/header_includes/liboption.c b/tests/header_includes/liboption.c
@@ -1,7 +1,8 @@
 /*
 RUN: cat header_includes_call_gates_1.ld | FileCheck --check-prefix=LINKARGS %s
 */
-#include <criterion/logging.h>
+
+#include <ia2_test_runner.h>
 #include "liboption.h"
 #include "types.h"
 

diff --git a/tests/header_includes/main.c b/tests/header_includes/main.c
@@ -3,8 +3,8 @@ RUN: sh -c 'if [ ! -s "header_includes_call_gates_0.ld" ]; then echo "No link ar
 */
 #include "liboption.h"
 #include "types.h"
-#include <criterion/criterion.h>
-#include <criterion/logging.h>
+#include <ia2_test_runner.h>
+
 #include <ia2.h>
 
 INIT_RUNTIME(1);

diff --git a/tests/heap_two_keys/main.c b/tests/heap_two_keys/main.c
@@ -1,9 +1,9 @@
 /*
 RUN: sh -c 'if [ ! -s "heap_two_keys_call_gates_0.ld" ]; then echo "No link args as expected"; exit 0; fi; echo "Unexpected link args"; exit 1;'
 */
-#include <criterion/criterion.h>
-#include <criterion/logging.h>
-#include <criterion/new/assert.h>
+#include <ia2_test_runner.h>
+
+
 #include <unistd.h>
 #include <assert.h>
 #include <ia2.h>

diff --git a/tests/macro_attr/functions.c b/tests/macro_attr/functions.c
@@ -1,7 +1,8 @@
 /*
 RUN: cat macro_attr_call_gates_1.ld | FileCheck --check-prefix=LINKARGS %s
 */
-#include <criterion/logging.h>
+
+#include <ia2_test_runner.h>
 #include "functions.h"
 
 // LINKARGS: --wrap=f

diff --git a/tests/macro_attr/main.c b/tests/macro_attr/main.c
@@ -3,7 +3,7 @@ RUN: sh -c 'if [ ! -s "macro_attr_call_gates_0.ld" ]; then echo "No link args as
 */
 #include "functions.h"
 #include <ia2.h>
-#include <criterion/criterion.h>
+#include <ia2_test_runner.h>
 
 INIT_RUNTIME(1);
 #define IA2_COMPARTMENT 1

diff --git a/tests/minimal/main.c b/tests/minimal/main.c
@@ -4,7 +4,7 @@ RUN: sh -c 'if [ ! -s "minimal_call_gates_0.ld" ]; then echo "No link args as ex
 
 // Check that readelf shows exactly one executable segment
 
-#include <criterion/criterion.h>
+#include <ia2_test_runner.h>
 #include "minimal.h"
 #include <ia2.h>
 

diff --git a/tests/minimal/minimal.c b/tests/minimal/minimal.c
@@ -2,8 +2,9 @@
 RUN: cat minimal_call_gates_1.ld | FileCheck --check-prefix=LINKARGS %s
 */
 
+#include <ia2_test_runner.h>
 #include "minimal.h"
-#include <criterion/logging.h>
+
 
 // LINKARGS: --wrap=arg1
 void arg1(int x) {

diff --git a/tests/mmap_loop/main.c b/tests/mmap_loop/main.c
@@ -6,7 +6,7 @@ RUN: sh -c 'if [ ! -s "mmap_loop_call_gates_0.ld" ]; then echo "No link args as
 #include <ia2.h>
 #include <math.h>
 #include <stdio.h>
-#include <criterion/criterion.h>
+#include <ia2_test_runner.h>
 
 #define IA2_DEFINE_TEST_HANDLER
 #include "test_fault_handler.h"

diff --git a/tests/permissive_mode/permissive_mode.c b/tests/permissive_mode/permissive_mode.c
@@ -1,7 +1,7 @@
 #ifndef _GNU_SOURCE
 #define _GNU_SOURCE
 #endif
-#include <criterion/criterion.h>
+#include <ia2_test_runner.h>
 #include <ia2.h>
 #include <permissive_mode.h>
 

diff --git a/tests/protected_threads/main.c b/tests/protected_threads/main.c
@@ -8,7 +8,7 @@ RUN: sh -c 'if [ ! -s "protected_threads_call_gates_0.ld" ]; then echo "No link
 #include <string.h>
 #include <sys/wait.h>
 #define IA2_DEFINE_TEST_HANDLER
-#include <criterion/criterion.h>
+#include <ia2_test_runner.h>
 #include <test_fault_handler.h>
 #include <unistd.h>
 

diff --git a/tests/read_config/builtin.c b/tests/read_config/builtin.c
@@ -1,7 +1,8 @@
 /*
 RUN: cat read_config_call_gates_2.ld | FileCheck --check-prefix=LINKARGS %s
 */
-#include <criterion/logging.h>
+
+#include <ia2_test_runner.h>
 #include <stdlib.h>
 #include <string.h>
 #include <ia2.h>

diff --git a/tests/read_config/main.c b/tests/read_config/main.c
@@ -5,8 +5,8 @@ RUN: cat main.c | FileCheck --match-full-lines --check-prefix=REWRITER %s
 
 // Check that readelf shows exactly one executable segment
 #include "plugin.h"
-#include <criterion/criterion.h>
-#include <criterion/logging.h>
+#include <ia2_test_runner.h>
+
 #include <ia2.h>
 #include <ia2_allocator.h>
 #include <string.h>

diff --git a/tests/read_config/plugin.c b/tests/read_config/plugin.c
@@ -7,7 +7,8 @@ We need this because main.c uses LINKARGS checks but not this file.
 #include "plugin.h"
 #include "core.h"
 #include <ia2.h>
-#include <criterion/logging.h>
+#include <ia2_test_runner.h>
+
 #include <stdlib.h>
 #include <string.h>
 

diff --git a/tests/recursion/dso.c b/tests/recursion/dso.c
@@ -2,7 +2,7 @@
 RUN: cat recursion_call_gates_1.ld | FileCheck --check-prefix=LINKARGS %s
 */
 #include "recursion_main.h"
-#include <criterion/criterion.h>
+#include <ia2_test_runner.h>
 #include <ia2.h>
 #include <stdio.h>
 

diff --git a/tests/recursion/main.c b/tests/recursion/main.c
@@ -3,8 +3,8 @@ RUN: cat recursion_call_gates_2.ld | FileCheck --check-prefix=LINKARGS %s
 */
 
 #include "recursion_dso.h"
-#include <criterion/criterion.h>
-#include <criterion/logging.h>
+#include <ia2_test_runner.h>
+
 #include <ia2.h>
 #include <stdio.h>
 #define IA2_DEFINE_TEST_HANDLER

diff --git a/tests/rewrite_fn_ptr_eq/lib.c b/tests/rewrite_fn_ptr_eq/lib.c
@@ -1,8 +1,8 @@
 /*
 RUN: cat rewrite_fn_ptr_eq_call_gates_1.ld | FileCheck --check-prefix=LINKARGS %s
 */
-#include <criterion/criterion.h>
-#include <criterion/logging.h>
+#include <ia2_test_runner.h>
+
 #include <lib.h>
 #include <stddef.h>
 #include <stdio.h>

diff --git a/tests/rewrite_fn_ptr_eq/main.c b/tests/rewrite_fn_ptr_eq/main.c
@@ -1,7 +1,7 @@
 /*
 RUN: cat main.c | FileCheck --match-full-lines --check-prefix=REWRITER %S/main.c
 */
-#include <criterion/criterion.h>
+#include <ia2_test_runner.h>
 #include <stdio.h>
 #include <lib.h>
 #include <ia2.h>

diff --git a/tests/rewrite_macros/main.c b/tests/rewrite_macros/main.c
@@ -4,7 +4,7 @@ RUN: cat main.c | FileCheck --match-full-lines --check-prefix=REWRITER %s
 #include "lib.h"
 #include <stddef.h>
 #include <ia2.h>
-#include <criterion/criterion.h>
+#include <ia2_test_runner.h>
 
 INIT_RUNTIME(1);
 #define IA2_COMPARTMENT 1

diff --git a/tests/ro_sharing/main.c b/tests/ro_sharing/main.c
@@ -1,8 +1,8 @@
 /*
 RUN: sh -c 'if [ ! -s "ro_sharing_call_gates_0.ld" ]; then echo "No link args as expected"; exit 0; fi; echo "Unexpected link args"; exit 1;'
 */
-#include <criterion/criterion.h>
-#include <criterion/logging.h>
+#include <ia2_test_runner.h>
+
 #include <plugin.h>
 #include <ia2.h>
 #include <stdio.h>

diff --git a/tests/ro_sharing/plugin.c b/tests/ro_sharing/plugin.c
@@ -2,7 +2,8 @@
 RUN: cat ro_sharing_call_gates_1.ld | FileCheck --check-prefix=LINKARGS %s
 */
 #include "test_fault_handler.h"
-#include <criterion/logging.h>
+#include <ia2_test_runner.h>
+
 #include <ia2.h>
 #include <stdint.h>
 #include <stdio.h>

diff --git a/tests/shared_data/access_shared.c b/tests/shared_data/access_shared.c
@@ -3,7 +3,8 @@ RUN: cat shared_data_call_gates_1.ld | FileCheck --check-prefix=LINKARGS %s
 */
 #include <stdio.h>
 #include "access_shared.h"
-#include <criterion/logging.h>
+#include <ia2_test_runner.h>
+
 
 // LINKARGS: --wrap=read_shared
 uint8_t read_shared(uint8_t *shared) {

diff --git a/tests/shared_data/main.c b/tests/shared_data/main.c
@@ -5,7 +5,7 @@ RUN: sh -c 'if [ ! -s "shared_data_call_gates_0.ld" ]; then echo "No link args a
 #include <assert.h>
 #include <ia2.h>
 #include "access_shared.h"
-#include <criterion/criterion.h>
+#include <ia2_test_runner.h>
 
 INIT_RUNTIME(1);
 #define IA2_COMPARTMENT 1

diff --git a/tests/should_segfault/main.c b/tests/should_segfault/main.c
@@ -1,7 +1,7 @@
 /*
 RUN: sh -c 'if [ ! -s "should_segfault_call_gates_0.ld" ]; then echo "No link args as expected"; exit 0; fi; echo "Unexpected link args"; exit 1;'
 */
-#include <criterion/criterion.h>
+#include <ia2_test_runner.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <stdint.h>

diff --git a/tests/should_segfault/print_secret.c b/tests/should_segfault/print_secret.c
@@ -1,7 +1,7 @@
 /*
 RUN: cat should_segfault_call_gates_1.ld | FileCheck --check-prefix=LINKARGS %s
 */
-#include <criterion/criterion.h>
+#include <ia2_test_runner.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdbool.h>