diff options
| -rwxr-xr-x | tests/regression | 11 | ||||
| -rw-r--r-- | tools/.gitignore | 8 | ||||
| -rw-r--r-- | tools/Makefile | 8 | ||||
| -rwxr-xr-x | tools/scmp_app_inspector (renamed from tools/sys_inspector) | 0 | ||||
| -rw-r--r-- | tools/scmp_arch_detect.c (renamed from tools/arch_detect.c) | 0 | ||||
| -rw-r--r-- | tools/scmp_bpf_disasm.c (renamed from tools/bpf_disasm.c) | 0 | ||||
| -rw-r--r-- | tools/scmp_bpf_sim.c (renamed from tools/bpf_sim.c) | 0 | ||||
| -rw-r--r-- | tools/scmp_sys_resolver.c (renamed from tools/sys_resolver.c) | 0 |
8 files changed, 15 insertions, 12 deletions
diff --git a/tests/regression b/tests/regression index b9f81f8..6e3d6d1 100755 --- a/tests/regression +++ b/tests/regression @@ -22,7 +22,10 @@ # GLBL_ARCH_SUPPORT="x86 x86_64 x32 arm" -GLBL_SYS_RESOLVER="../tools/sys_resolver" + +GLBL_SYS_ARCH="../tools/scmp_arch_detect" +GLBL_SYS_RESOLVER="../tools/scmp_sys_resolver" +GLBL_SYS_SIM="../tools/scmp_bpf_sim" #### # functions @@ -287,7 +290,7 @@ function run_test_bpf_sim_fuzz() { # simulate the fuzzed syscall data against the BPF filter, we # don't verify the resulting action since we're just testing for # stability - allow=$(../tools/bpf_sim -f $tmpfile -s $sys \ + allow=$($GLBL_SYS_SIM -f $tmpfile -s $sys \ ${arg[0]} ${arg[1]} ${arg[2]} ${arg[3]} ${arg[4]} \ ${arg[5]}) rc=$? @@ -473,7 +476,7 @@ function run_test_bpf_sim() { # simulate the specifed syscall against the BPF filter # and verify the results - action=$(../tools/bpf_sim -a $simarch -f $tmpfile \ + action=$($GLBL_SYS_SIM -a $simarch -f $tmpfile \ -s $sys ${arg[0]} ${arg[1]} ${arg[2]} \ ${arg[3]} ${arg[4]} ${arg[5]}) rc=$? @@ -804,7 +807,7 @@ else fi # determine the current system's architecture -arch=$(../tools/arch_detect) +arch=$($GLBL_SYS_ARCH) # display the test output and run the requested tests echo "=============== $(date) ===============" >&$logfd diff --git a/tools/.gitignore b/tools/.gitignore index 0822833..af4051c 100644 --- a/tools/.gitignore +++ b/tools/.gitignore @@ -1,4 +1,4 @@ -bpf_disasm -bpf_sim -sys_resolver -arch_detect +scmp_bpf_disasm +scmp_bpf_sim +scmp_sys_resolver +scmp_arch_detect diff --git a/tools/Makefile b/tools/Makefile index db6b609..0d8a0ab 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -33,10 +33,10 @@ include $(TOPDIR)/configure.mk LDFLAGS := ../src/libseccomp.a -TOOLS = bpf_disasm \ - bpf_sim \ - sys_resolver \ - arch_detect +TOOLS = scmp_bpf_disasm \ + scmp_bpf_sim \ + scmp_sys_resolver \ + scmp_arch_detect DEPS = $(TOOLS:%=%.d) diff --git a/tools/sys_inspector b/tools/scmp_app_inspector index 37f880b..37f880b 100755 --- a/tools/sys_inspector +++ b/tools/scmp_app_inspector diff --git a/tools/arch_detect.c b/tools/scmp_arch_detect.c index 0aca5a8..0aca5a8 100644 --- a/tools/arch_detect.c +++ b/tools/scmp_arch_detect.c diff --git a/tools/bpf_disasm.c b/tools/scmp_bpf_disasm.c index 5b63fe8..5b63fe8 100644 --- a/tools/bpf_disasm.c +++ b/tools/scmp_bpf_disasm.c diff --git a/tools/bpf_sim.c b/tools/scmp_bpf_sim.c index 94c6648..94c6648 100644 --- a/tools/bpf_sim.c +++ b/tools/scmp_bpf_sim.c diff --git a/tools/sys_resolver.c b/tools/scmp_sys_resolver.c index 5bc593e..5bc593e 100644 --- a/tools/sys_resolver.c +++ b/tools/scmp_sys_resolver.c |