modify testing setup, try to fix workflow

- fix bug for resolving executable
- change the correctness tests to call a harness and support any script
  file.
- fix the workflow file to install trace_v3 and its programs and maps

Author: nad2040

.github/workflows/test.yaml

@@ -37,10 +37,11 @@ jobs:
       - name: checkout
         uses: actions/checkout@v4
 
-      - name: build
+      - name: build and install
         run: |
           cargo build --release
-          sudo install -o root -m 4755 target/release/trace_v3 /usr/local/bin
+          sudo ./install.sh
+          trace_v3 install
 
       - name: run tests
         run: |

src/utils.rs

@@ -15,6 +15,14 @@ pub fn invoker_permissions() -> Result<(u32, u32)> {
 }
 
 pub fn resolve_executable(executable: &str) -> Result<PathBuf> {
+    let path_obj = PathBuf::from(executable);
+    if path_obj.is_absolute() || executable.contains('/') {
+        if path_obj.exists() {
+            return Ok(path_obj);
+        }
+        return Err(anyhow!("executable not found at specified path"));
+    }
+
     let path = env::var("PATH")?;
     for p in path.split(':') {
         let executable_path = PathBuf::from(p).join(executable);

tests/correctness/harness.sh

@@ -0,0 +1,22 @@
+#!/bin/sh
+
+test_name=$(basename "${1}" .sh)
+export TEST_OUTPUT="${TEST_OUTPUT:-$(mktemp -d /tmp/trace_v3_XXXX)/correctness}/${test_name}"
+mkdir -p "${TEST_OUTPUT}"
+
+echo Running correctness harness for ${test_name}
+cat "./${test_name}.sh"
+
+trace_v3 --dep-file /dev/null --trace-file "${TEST_OUTPUT}/trace_v3_log" -- "./${test_name}.sh" >/dev/null 2>&1
+
+strace -y -f --seccomp-bpf -e %file,fork,clone,fcntl -o "${TEST_OUTPUT}/strace_log" -- "./${test_name}.sh" >/dev/null 2>&1
+
+cat "${TEST_OUTPUT}/trace_v3_log" | cut -d'(' -f1 > "${TEST_OUTPUT}/trace_v3_calls"
+cat "${TEST_OUTPUT}/strace_log" | cut -d' ' -f2 | cut -d'(' -f1 | grep -v "+++" > "${TEST_OUTPUT}/strace_calls"
+
+diff "${TEST_OUTPUT}/trace_v3_calls" "${TEST_OUTPUT}/strace_calls" > "${TEST_OUTPUT}/diff"
+diff_status=$?
+
+echo Reported results for "$@" in "${TEST_OUTPUT}"
+cat "${TEST_OUTPUT}/diff"
+exit $diff_status

tests/correctness/run-harness.sh

@@ -0,0 +1,14 @@
+#!/bin/sh
+
+set -e
+
+PROJ_ROOT="${PROJ_ROOT:-$(git rev-parse --show-toplevel)}"
+cd "${PROJ_ROOT}/tests/correctness"
+
+export TEST_OUTPUT="${TEST_OUTPUT:-$(mktemp -d /tmp/trace_v3_XXXX)}/correctness"
+mkdir -p "${TEST_OUTPUT}"
+
+for f in ./test-*
+do
+    ./harness.sh $f
+done

tests/correctness/test-find.sh

@@ -1,23 +1,2 @@
 #!/bin/sh
-
-PROJ_ROOT="${PROJ_ROOT:-$(git rev-parse --show-toplevel)}"
-TEST="${PROJ_ROOT}"/tests
-TRACE=${TRACE:-$1}
-
-TRACE_V3_OUTPUT=$(mktemp)
-STRACE_OUTPUT=$(mktemp)
-
-echo trace_v3
-"${TRACE}" --dep-file /dev/null --trace-file $TRACE_V3_OUTPUT -- find /
-
-echo strace
-strace -y -f --seccomp-bpf -e %file,fork,clone,fcntl -o $STRACE_OUTPUT -- find /
-
-echo get syscalls
-cat $TRACE_V3_OUTPUT | cut -d'(' -f1 > "${TRACE_V3_OUTPUT}calls"
-cat $STRACE_OUTPUT | cut -d' ' -f2 | cut -d'(' -f1 > "${STRACE_OUTPUT}calls"
-
-echo diff
-diff "${TRACE_V3_OUTPUT}calls" "${STRACE_OUTPUT}calls"
-
-echo done
+find /

tests/correctness/test-ls.sh

@@ -1,23 +1,2 @@
 #!/bin/sh
-
-PROJ_ROOT="${PROJ_ROOT:-$(git rev-parse --show-toplevel)}"
-TEST="${PROJ_ROOT}"/tests
-TRACE=${TRACE:-$1}
-
-TRACE_V3_OUTPUT=$(mktemp)
-STRACE_OUTPUT=$(mktemp)
-
-echo trace_v3
-"${TRACE}" --dep-file /dev/null --trace-file $TRACE_V3_OUTPUT -- ls
-
-echo strace
-strace -y -f --seccomp-bpf -e %file,fork,clone,fcntl -o $STRACE_OUTPUT -- ls
-
-echo get syscalls
-cat $TRACE_V3_OUTPUT | cut -d'(' -f1 > "${TRACE_V3_OUTPUT}calls"
-cat $STRACE_OUTPUT | cut -d' ' -f2 | cut -d'(' -f1 > "${STRACE_OUTPUT}calls"
-
-echo diff
-diff "${TRACE_V3_OUTPUT}calls" "${STRACE_OUTPUT}calls"
-
-echo done
+ls -latr

tests/run-tests.sh

@@ -4,16 +4,6 @@ export PROJ_ROOT="$(git rev-parse --show-toplevel)"
 
 export TRACE=$(which trace_v3)
 
-for test in "${PROJ_ROOT}"/tests/correctness/test-*.sh
-do
-    echo "Running $(basename $test)"
-    ${test} 1>"${test}.out" 2>"${test}.err"
-    echo "==== STDOUT ===="
-    cat "${test}.out"
-    echo "==== STDERR ===="
-    cat "${test}.err"
-done
-
 for test in "${PROJ_ROOT}"/tests/short/test-*.sh
 do
     echo "Running $(basename $test)"
@@ -33,3 +23,7 @@ do
     echo "==== STDERR ===="
     cat "${test}.err"
 done
+
+echo "==== CORRECTNESS TESTS ===="
+"${PROJ_ROOT}/tests/correctness/run-harness.sh"
+