Remove lit

rewriter/CMakeLists.txt

@@ -6,7 +6,6 @@ message(STATUS "Found LLVM: ${LLVM_DIR} (found version \"${LLVM_PACKAGE_VERSION}
 find_package(Clang REQUIRED CONFIG)
 message(STATUS "Found Clang: ${Clang_DIR}")
 
-# We use the lit CMake functions from LLVM
 list(APPEND CMAKE_MODULE_PATH "${LLVM_CMAKE_DIR}")
 include(AddLLVM)
 

rewriter/tests/CMakeLists.txt

@@ -6,21 +6,9 @@ include("../../cmake/define-ia2-wrapper.cmake")
 include("../../cmake/define-test.cmake")
 include("../../cmake/add-tls-padded-library.cmake")
 
-configure_lit_site_cfg(
-  ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.py.in
-  ${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg.py
-  MAIN_CONFIG
-  ${CMAKE_CURRENT_SOURCE_DIR}/lit.cfg.py
-  )
-
 set(IA2_TEST_DEPENDS ia2-rewriter)
 
-add_lit_testsuite(check-ia2 "Running the IA2 tests"
-  ${CMAKE_CURRENT_BINARY_DIR}
-  DEPENDS ${IA2_TEST_DEPENDS} partition-alloc
-  ARGS "--verbose"
-  )
-set_target_properties(check-ia2 PROPERTIES FOLDER "tests")
+add_custom_target(check-ia2)
 
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 

rewriter/tests/ffmpeg/ffmpeg.test

@@ -1,24 +1,10 @@
 # libavformat
-RUN: sh -c "for hdr in avformat.h avio.h; do %ia2_generate_checks $(pkg-config --variable includedir libavformat)/libavformat/$hdr %S/include %T/$hdr; done"
-RUN: ia2-rewriter --output-header %T/fn_ptr_ia2_avformat.h %T/wrapper.c %T/avformat.h %T/avio.h -- -I%resource_dir -I%ia2_include
 
-RUN: cat %T/wrapper.c.args | FileCheck --check-prefix=LINKARGS %T/avformat.h
-RUN: cat %T/wrapper.c.args | FileCheck --check-prefix=LINKARGS %T/avio.h
 
 # libavutil
-RUN: sh -c "for hdr in dict.h version.h macros.h common.h attributes.h mem.h avutil.h rational.h mathematics.h intfloat.h error.h log.h pixfmt.h; do %ia2_generate_checks $(pkg-config --variable includedir libavutil)/libavutil/$hdr %S/include %T/$hdr; done"
-RUN: ia2-rewriter --output-header %T/fn_ptr_ia2_avutil.h %T/wrapper.c %T/dict.h %T/version.h %T/macros.h %T/common.h %T/attributes.h %T/mem.h %T/avutil.h %T/rational.h %T/mathematics.h %T/intfloat.h %T/error.h %T/log.h %T/pixfmt.h -- -I%resource_dir -I%ia2_include
 
-RUN: cat %T/wrapper.c.args | FileCheck --check-prefix=LINKARGS %T/dict.h
 # version.h has only #defines, so it doesn't have anything we would CHECK
 # macros.h has only #defines, so it doesn't have anything we would CHECK
-RUN: cat %T/wrapper.c.args | FileCheck --check-prefix=LINKARGS %T/common.h
 # attributes.h has only #defines, so it doesn't have anything we would CHECK
-RUN: cat %T/wrapper.c.args | FileCheck --check-prefix=LINKARGS %T/mem.h
-RUN: cat %T/wrapper.c.args | FileCheck --check-prefix=LINKARGS %T/avutil.h
-RUN: cat %T/wrapper.c.args | FileCheck --check-prefix=LINKARGS %T/rational.h
-RUN: cat %T/wrapper.c.args | FileCheck --check-prefix=LINKARGS %T/mathematics.h
 # intfloat.h has only #defines and "static inline" functions, so it doesn't have anything we would CHECK for now
-RUN: cat %T/wrapper.c.args | FileCheck --check-prefix=LINKARGS %T/error.h
-RUN: cat %T/wrapper.c.args | FileCheck --check-prefix=LINKARGS %T/log.h
 # pixfmt.h has only #defines and enums, so it doesn't have anything we would CHECK

rewriter/tests/global_fn_ptr/include/operations.h

@@ -1,12 +1,8 @@
-/*
-RUN: cat %t.c.args | FileCheck --check-prefix=LINKARGS %s
-*/
 
 #pragma once
 #include <stdlib.h>
 #include <stdint.h>
 
-// LINKARGS: --wrap=call_operations
 uint32_t call_operation(size_t i);
 
 // CHECK: typedef struct IA2_fnptr__ZTSPFjjjE WordFn;

rewriter/tests/global_fn_ptr/main.c

@@ -1,6 +1,3 @@
-/*
-RUN: sh -c 'if [ ! -s "global_fn_ptr_call_gates_0.ld" ]; then echo "No link args as expected"; exit 0; fi; echo "Unexpected link args"; exit 1;'
-*/
 #include "operations.h"
 #include <ia2.h>
 #include <criterion/criterion.h>
@@ -15,24 +12,20 @@ INIT_RUNTIME(1);
 
 // `sum` can't be set to __ia2_add since it's defined in asm so the compiler doesn't know it's a valid initializer
 //static WordFn sum = __ia2_add;
-// REWRITER: static WordFn sum = IA2_FN(add);
 static WordFn sum = add;
-// REWRITER: static HalfFn diff = IA2_FN(sub);
 static HalfFn diff = sub;
 // The following won't compile since the inner pointer is also type-specific
 //static HalfFn mul = {&__ia2_mul_0_1};
 
 Op operations[2] IA2_SHARED_DATA = {
     {
         { "add", 4 },
-        // REWRITER: IA2_FN(add),
         add,
         { "Adds two u32s", 14 },
         0,
     },
     {
         { "mul", 4 },
-        // REWRITER: IA2_FN(mul),
         mul,
         { "Multiply two u32s", 18 },
         0,

rewriter/tests/global_fn_ptr/operations.c

@@ -1,13 +1,9 @@
-/*
-RUN: cat global_fn_ptr_call_gates_1.ld | FileCheck --check-prefix=LINKARGS %s
-*/
 #include "operations.h"
 #include <criterion/criterion.h>
 #include <stdio.h>
 
 extern Op operations[2];
 
-// LINKARGS: --wrap=call_operation
 uint32_t call_operation(size_t i) {
     // TODO: Add a way to share strings between compartments
     //printf("%s\n", operations[i].desc.data);

rewriter/tests/header_includes/impl.c

@@ -1,9 +1,5 @@
-/*
-RUN: cat header_includes_call_gates_1.ld | FileCheck --check-prefix=LINKARGS %s
-*/
 #include "types.h"
 
-// LINKARGS: --wrap=unwrap_or
 int unwrap_or(Option opt, int default_value) {
     if (opt.present) {
         return opt.value;

rewriter/tests/header_includes/include/impl.h

@@ -1,5 +1,4 @@
 #pragma once
 #include "types.h"
 
-// LINKARGS: --wrap=unwrap_or
 int unwrap_or(Option opt, int default_value);

rewriter/tests/header_includes/liboption.c

@@ -1,11 +1,7 @@
-/*
-RUN: cat header_includes_call_gates_1.ld | FileCheck --check-prefix=LINKARGS %s
-*/
 #include <criterion/logging.h>
 #include "liboption.h"
 #include "types.h"
 
-// LINKARGS: --wrap=None
 Option None() {
     cr_log_info("returning `None`");
     Option none = {
@@ -15,7 +11,6 @@ Option None() {
     return none;
 }
 
-// LINKARGS: --wrap=Some
 Option Some(int x) {
     cr_log_info("returning `Some(%d)`", x);
     Option opt = {

rewriter/tests/header_includes/main.c

@@ -1,6 +1,3 @@
-/*
-RUN: sh -c 'if [ ! -s "header_includes_call_gates_0.ld" ]; then echo "No link args as expected"; exit 0; fi; echo "Unexpected link args"; exit 1;'
-*/
 #include "liboption.h"
 #include "types.h"
 #include <criterion/criterion.h>

rewriter/tests/heap_two_keys/main.c

@@ -1,6 +1,3 @@
-/*
-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>

rewriter/tests/heap_two_keys/plugin.c

@@ -1,6 +1,3 @@
-/*
-RUN: cat heap_two_keys_call_gates_1.ld | FileCheck --check-prefix=LINKARGS %s
-*/
 #include <stdio.h>
 #include <ia2.h>
 #include "exported_fn.h"
@@ -9,7 +6,6 @@ RUN: cat heap_two_keys_call_gates_1.ld | FileCheck --check-prefix=LINKARGS %s
 #define IA2_COMPARTMENT 2
 #include <ia2_compartment_init.inc>
 
-// LINKARGS: --wrap=read_from_plugin
 uint8_t read_from_plugin(uint8_t *ptr) {
   if (ptr == NULL) {
     return -1;
@@ -18,7 +14,6 @@ uint8_t read_from_plugin(uint8_t *ptr) {
   return read;
 }
 
-// LINKARGS: --wrap=read_from_plugin_expect_fault
 uint8_t read_from_plugin_expect_fault(uint8_t *ptr) {
   if (ptr == NULL) {
     return -1;
@@ -27,18 +22,15 @@ uint8_t read_from_plugin_expect_fault(uint8_t *ptr) {
   return read;
 }
 
-// LINKARGS: --wrap=trigger_compartment_init
 void trigger_compartment_init(void) {}
 
-// LINKARGS: --wrap=write_from_plugin
 void write_from_plugin(uint8_t *ptr, uint8_t value) {
   if (ptr == NULL) {
     return;
   }
   *ptr = value;
 }
 
-// LINKARGS: --wrap=write_from_plugin_expect_fault
 void write_from_plugin_expect_fault(uint8_t *ptr, uint8_t value) {
   if (ptr == NULL) {
     return;

rewriter/tests/libusb/libusb.test

@@ -1,4 +0,0 @@
-RUN: sh -c "%ia2_generate_checks $(pkg-config --variable includedir libusb-1.0)/libusb-1.0/libusb.h %S/include %T/libusb.h"
-RUN: ia2-rewriter --output-header %T/fn_ptr_ia2.h %T/wrapper.c %T/libusb.h -- -I%resource_dir -I%ia2_include
-RUN: cat %T/wrapper.c.args | FileCheck --check-prefix=LINKARGS %T/libusb.h
-RUN: cat %T/libusb.h | sed 's/^.*CHECK.*$//' | FileCheck --check-prefix 'TYPEDEF-CHECK' %T/libusb.h

rewriter/tests/macro_attr/functions.c

@@ -1,15 +1,10 @@
-/*
-RUN: cat macro_attr_call_gates_1.ld | FileCheck --check-prefix=LINKARGS %s
-*/
 #include <criterion/logging.h>
 #include "functions.h"
 
-// LINKARGS: --wrap=f
 void f() {
     cr_log_info("Called `f()`");
 }
 
-// LINKARGS: --wrap=g
 void g() {
     cr_log_info("Called `g()`");
 }
@@ -20,17 +15,14 @@ void h(CB cb) {
     cb(0);
 }
 
-// LINKARGS: --wrap=i
 void i() {
     cr_log_info("Called `i()`");
 }
 
-// LINKARGS: --wrap=j
 void j() {
     cr_log_info("Called `j()`");
 }
 
-// LINKARGS: --wrap=k
 void k() {
     cr_log_info("Called `k()`");
 }

rewriter/tests/macro_attr/main.c

@@ -1,6 +1,3 @@
-/*
-RUN: sh -c 'if [ ! -s "macro_attr_call_gates_0.ld" ]; then echo "No link args as expected"; exit 0; fi; echo "Unexpected link args"; exit 1;'
-*/
 #include "functions.h"
 #include <ia2.h>
 #include <criterion/criterion.h>

rewriter/tests/minimal/main.c

@@ -1,11 +1,5 @@
-/*
-RUN: sh -c 'if [ ! -s "minimal_call_gates_0.ld" ]; then echo "No link args as expected"; exit 0; fi; echo "Unexpected link args"; exit 1;'
-RUN: readelf -lW %binary_dir/tests/minimal/minimal_main_wrapped | FileCheck --check-prefix=SEGMENTS %s
-*/
 
 // Check that readelf shows exactly one executable segment
-// SEGMENTS-COUNT-1: LOAD{{.*}}R E
-// SEGMENTS-NOT:     LOAD{{.*}}R E
 
 #include <criterion/criterion.h>
 #include "minimal.h"

rewriter/tests/minimal/minimal.c

@@ -1,21 +1,15 @@
-/*
-RUN: cat minimal_call_gates_1.ld | FileCheck --check-prefix=LINKARGS %s
-*/
 
 #include "minimal.h"
 #include <criterion/logging.h>
 
-// LINKARGS: --wrap=arg1
 void arg1(int x) {
     cr_log_info("arg1");
 }
 
-// LINKARGS: --wrap=foo
 void foo() {
     cr_log_info("foo");
 }
 
-// LINKARGS: --wrap=return_val
 int return_val() {
     cr_log_info("return_val");
     return 1;

rewriter/tests/mmap_loop/CMakeLists.txt

@@ -1,6 +1,3 @@
-set(STDOUT_REF ${CMAKE_CURRENT_SOURCE_DIR}/Output/mmap_loop.out)
-configure_file(${STDOUT_REF} ${CMAKE_CURRENT_BINARY_DIR}/mmap_loop.out)
-
 define_shared_lib(
     SRCS mmap_loop.c
     PKEY 2