From 05bdc8bfd90eba04c40596ded77394c5dacdb7ce Mon Sep 17 00:00:00 2001 From: Lucas Ramage Date: Thu, 19 Dec 2019 15:37:02 -0500 Subject: [PATCH] Actually renames tests --- .gitignore | 12 +- {tests => test}/argv.c | 0 {tests => test}/argv0.c | 0 {tests => test}/cat.c | 0 {tests => test}/chdir_getcwd.c | 0 {tests => test}/chroot.c | 0 {tests => test}/echo.c | 0 {tests => test}/exec.c | 0 {tests => test}/false.c | 0 {tests => test}/fchdir_getcwd.c | 0 {tests => test}/fork-wait.c | 0 {tests => test}/getresgid.c | 0 {tests => test}/getresuid.c | 0 {tests => test}/ptrace-2.c | 0 {tests => test}/ptrace.c | 0 {tests => test}/puts_proc_self_exe.c | 0 {tests => test}/pwd.c | 0 {tests => test}/readdir.c | 0 {tests => test}/readlink.c | 0 {tests => test}/symlink.c | 0 {tests => test}/test-00000000.sh | 0 {tests => test}/test-0228fbe7.sh | 0 {tests => test}/test-0238c7f1.sh | 0 {tests => test}/test-03969e70.sh | 0 {tests => test}/test-071599da.sh | 0 {tests => test}/test-0830d8a8.sh | 0 {tests => test}/test-092c5e26.sh | 0 {tests => test}/test-0cf405b0.c | 0 {tests => test}/test-11111111.sh | 0 {tests => test}/test-16573e73.c | 0 {tests => test}/test-1743dd3d.sh | 0 {tests => test}/test-1c68c218.c | 0 {tests => test}/test-1cd9d8f9.sh | 0 {tests => test}/test-1fedd9a3.sh | 0 {tests => test}/test-1ffc8309.c | 0 {tests => test}/test-1ffc8309.sh | 0 {tests => test}/test-22222222.sh | 0 {tests => test}/test-230f47cf.sh.disabled | 0 {tests => test}/test-230f47cg.sh.deprecated | 0 {tests => test}/test-230f47ch.sh | 0 {tests => test}/test-2401b850.sh | 0 {tests => test}/test-25069c12.c | 0 {tests => test}/test-25069c13.c | 0 {tests => test}/test-2db65cd2.sh | 0 {tests => test}/test-305ae31d.c | 0 {tests => test}/test-305ae31d.sh | 0 {tests => test}/test-311b7a95.sh | 0 {tests => test}/test-33333333.c | 0 {tests => test}/test-33333334.c | 0 {tests => test}/test-3624be91.sh | 0 {tests => test}/test-3dec4597.sh | 0 {tests => test}/test-44444444.c | 0 {tests => test}/test-517e1d6a.sh | 0 {tests => test}/test-517e1d6b.sh | 0 {tests => test}/test-51943658.c | 0 {tests => test}/test-53355a5b.sh | 0 {tests => test}/test-5467b986.sh | 0 {tests => test}/test-55b731d3.sh | 0 {tests => test}/test-55fd1da5.sh | 0 {tests => test}/test-5996858d.sh | 0 {tests => test}/test-5bed7141.c | 0 {tests => test}/test-5bed7142.sh | 0 {tests => test}/test-5bed7143.c | 0 {tests => test}/test-654decce.sh | 0 {tests => test}/test-66666666.c | 0 {tests => test}/test-67972fbe.sh | 0 {tests => test}/test-691786c8.sh | 0 {tests => test}/test-6b5a254a.sh | 0 {tests => test}/test-6d1e2650.sh | 0 {tests => test}/test-6fb08ce1.sh | 0 {tests => test}/test-713b6910.sh | 0 {tests => test}/test-7601199b.sh | 0 {tests => test}/test-79cf6614.c | 0 {tests => test}/test-82ba4ba1.c | 0 {tests => test}/test-82ba4ba1.sh | 0 {tests => test}/test-88888888.c | 0 {tests => test}/test-8a83376a.sh | 0 {tests => test}/test-8e5fa256.sh | 0 {tests => test}/test-99999999.sh | 0 {tests => test}/test-9c07fad8.c | 0 {tests => test}/test-9f5eeb72.sh | 0 {tests => test}/test-a3e68988.c | 0 {tests => test}/test-a4d7ed70.sh | 0 {tests => test}/test-a8e69d6f.c | 0 {tests => test}/test-aaaaaaaa.sh | 0 {tests => test}/test-af062114.c | 0 {tests => test}/test-b161bc0a.sh | 0 {tests => test}/test-b6df3cbe.sh | 0 {tests => test}/test-b94dd86a.sh | 0 {tests => test}/test-bbbbbbbb.sh | 0 {tests => test}/test-bdc90417.c | 0 {tests => test}/test-c10e2073.c | 0 {tests => test}/test-c15999f9.sh | 0 {tests => test}/test-c47aeb7d.c | 0 {tests => test}/test-c5a7a0f0.c | 0 {tests => test}/test-c68d18dc.sh | 0 {tests => test}/test-c6b77b77.mk | 0 {tests => test}/test-c6b77b77.sh | 0 {tests => test}/test-careauth.sh | 0 {tests => test}/test-careexit.sh | 0 {tests => test}/test-carehwcp.sh | 0 {tests => test}/test-carequot.sh | 0 {tests => test}/test-cb1143ab.sh | 0 {tests => test}/test-cccccccc.sh | 0 {tests => test}/test-cdd39012.sh | 0 {tests => test}/test-cea75343.sh | 0 {tests => test}/test-chroot01.sh | 0 {tests => test}/test-commmmmm.sh | 0 {tests => test}/test-d1be631a.sh | 0 {tests => test}/test-d1da0d8d.sh | 0 {tests => test}/test-d2175fc3.sh | 0 {tests => test}/test-d2175fc4.c | 0 {tests => test}/test-d92b57ca.sh | 0 {tests => test}/test-dddddddd.sh | 0 {tests => test}/test-de756935.sh | 0 {tests => test}/test-df4de4db.sh | 0 {tests => test}/test-dfb0c3b6.sh | 0 {tests => test}/test-e87b34ae.c | 0 {tests => test}/test-e87ca6ca.sh | 0 {tests => test}/test-e940896f.sh | 0 {tests => test}/test-e99993c8.sh | 0 {tests => test}/test-eddeba0e.sh | 0 {tests => test}/test-f7089d4f.sh | 0 {tests => test}/test-fa205b56.c | 0 {tests => test}/test-fbca9cc2.sh | 0 {tests => test}/test-fdf487a0.c | 0 {tests => test}/test-ffffffff.sh | 0 {tests => test}/test-getres32.sh | 0 {tests => test}/test-getresid.sh | 0 {tests => test}/test-gggggggg.sh | 0 {tests => test}/test-hhhhhhhh.sh | 0 {tests => test}/test-iiiiiiii.c | 0 {tests => test}/test-killexit.sh | 0 {tests => test}/test-kkkkkkkk.c | 0 {tests => test}/test-mmmmmmmm.sh | 0 {tests => test}/test-nnnnnnnn.c | 0 {tests => test}/test-oooooooo.c | 0 {tests => test}/test-pppppppp.sh | 0 {tests => test}/test-proocare.sh | 0 {tests => test}/test-ptrace00.c | 0 {tests => test}/test-ptrace01.c | 0 {tests => test}/test-python01.sh | 0 {tests => test}/test-rrrrrrrr.sh | 0 {tests => test}/test-socket01.sh | 0 {tests => test}/test-socket02.sh | 0 {tests => test}/test-socket03.sh | 0 {tests => test}/test-ssssssss.c | 0 {tests => test}/test-tempdire.sh | 0 {tests => test}/test-wwwwwwww.sh | 0 {tests => test}/test-xxxxxxxx.c | 0 {tests => test}/test-yyyyyyyy.sh | 0 {tests => test}/true.c | 0 {tests => test}/validation.mk | 0 tests/GNUmakefile | 220 -------------------- tests/sockets/tcpsockets.py | 75 ------- tests/sockets/tcpsocketsipv6.py | 74 ------- tests/sockets/testtcpsocket.sh | 19 -- tests/sockets/testtcpsocketauto.sh | 19 -- tests/sockets/testtcpsocketipv6.sh | 19 -- tests/test-77777777.c.unreliable | 51 ----- 160 files changed, 6 insertions(+), 483 deletions(-) rename {tests => test}/argv.c (100%) rename {tests => test}/argv0.c (100%) rename {tests => test}/cat.c (100%) rename {tests => test}/chdir_getcwd.c (100%) rename {tests => test}/chroot.c (100%) rename {tests => test}/echo.c (100%) rename {tests => test}/exec.c (100%) rename {tests => test}/false.c (100%) rename {tests => test}/fchdir_getcwd.c (100%) rename {tests => test}/fork-wait.c (100%) rename {tests => test}/getresgid.c (100%) rename {tests => test}/getresuid.c (100%) rename {tests => test}/ptrace-2.c (100%) rename {tests => test}/ptrace.c (100%) rename {tests => test}/puts_proc_self_exe.c (100%) rename {tests => test}/pwd.c (100%) rename {tests => test}/readdir.c (100%) rename {tests => test}/readlink.c (100%) rename {tests => test}/symlink.c (100%) rename {tests => test}/test-00000000.sh (100%) rename {tests => test}/test-0228fbe7.sh (100%) rename {tests => test}/test-0238c7f1.sh (100%) rename {tests => test}/test-03969e70.sh (100%) rename {tests => test}/test-071599da.sh (100%) rename {tests => test}/test-0830d8a8.sh (100%) rename {tests => test}/test-092c5e26.sh (100%) rename {tests => test}/test-0cf405b0.c (100%) rename {tests => test}/test-11111111.sh (100%) rename {tests => test}/test-16573e73.c (100%) rename {tests => test}/test-1743dd3d.sh (100%) rename {tests => test}/test-1c68c218.c (100%) rename {tests => test}/test-1cd9d8f9.sh (100%) rename {tests => test}/test-1fedd9a3.sh (100%) rename {tests => test}/test-1ffc8309.c (100%) rename {tests => test}/test-1ffc8309.sh (100%) rename {tests => test}/test-22222222.sh (100%) rename {tests => test}/test-230f47cf.sh.disabled (100%) rename {tests => test}/test-230f47cg.sh.deprecated (100%) rename {tests => test}/test-230f47ch.sh (100%) rename {tests => test}/test-2401b850.sh (100%) rename {tests => test}/test-25069c12.c (100%) rename {tests => test}/test-25069c13.c (100%) rename {tests => test}/test-2db65cd2.sh (100%) rename {tests => test}/test-305ae31d.c (100%) rename {tests => test}/test-305ae31d.sh (100%) rename {tests => test}/test-311b7a95.sh (100%) rename {tests => test}/test-33333333.c (100%) rename {tests => test}/test-33333334.c (100%) rename {tests => test}/test-3624be91.sh (100%) rename {tests => test}/test-3dec4597.sh (100%) rename {tests => test}/test-44444444.c (100%) rename {tests => test}/test-517e1d6a.sh (100%) rename {tests => test}/test-517e1d6b.sh (100%) rename {tests => test}/test-51943658.c (100%) rename {tests => test}/test-53355a5b.sh (100%) rename {tests => test}/test-5467b986.sh (100%) rename {tests => test}/test-55b731d3.sh (100%) rename {tests => test}/test-55fd1da5.sh (100%) rename {tests => test}/test-5996858d.sh (100%) rename {tests => test}/test-5bed7141.c (100%) rename {tests => test}/test-5bed7142.sh (100%) rename {tests => test}/test-5bed7143.c (100%) rename {tests => test}/test-654decce.sh (100%) rename {tests => test}/test-66666666.c (100%) rename {tests => test}/test-67972fbe.sh (100%) rename {tests => test}/test-691786c8.sh (100%) rename {tests => test}/test-6b5a254a.sh (100%) rename {tests => test}/test-6d1e2650.sh (100%) rename {tests => test}/test-6fb08ce1.sh (100%) rename {tests => test}/test-713b6910.sh (100%) rename {tests => test}/test-7601199b.sh (100%) rename {tests => test}/test-79cf6614.c (100%) rename {tests => test}/test-82ba4ba1.c (100%) rename {tests => test}/test-82ba4ba1.sh (100%) rename {tests => test}/test-88888888.c (100%) rename {tests => test}/test-8a83376a.sh (100%) rename {tests => test}/test-8e5fa256.sh (100%) rename {tests => test}/test-99999999.sh (100%) rename {tests => test}/test-9c07fad8.c (100%) rename {tests => test}/test-9f5eeb72.sh (100%) rename {tests => test}/test-a3e68988.c (100%) rename {tests => test}/test-a4d7ed70.sh (100%) rename {tests => test}/test-a8e69d6f.c (100%) rename {tests => test}/test-aaaaaaaa.sh (100%) rename {tests => test}/test-af062114.c (100%) rename {tests => test}/test-b161bc0a.sh (100%) rename {tests => test}/test-b6df3cbe.sh (100%) rename {tests => test}/test-b94dd86a.sh (100%) rename {tests => test}/test-bbbbbbbb.sh (100%) rename {tests => test}/test-bdc90417.c (100%) rename {tests => test}/test-c10e2073.c (100%) rename {tests => test}/test-c15999f9.sh (100%) rename {tests => test}/test-c47aeb7d.c (100%) rename {tests => test}/test-c5a7a0f0.c (100%) rename {tests => test}/test-c68d18dc.sh (100%) rename {tests => test}/test-c6b77b77.mk (100%) rename {tests => test}/test-c6b77b77.sh (100%) rename {tests => test}/test-careauth.sh (100%) rename {tests => test}/test-careexit.sh (100%) rename {tests => test}/test-carehwcp.sh (100%) rename {tests => test}/test-carequot.sh (100%) rename {tests => test}/test-cb1143ab.sh (100%) rename {tests => test}/test-cccccccc.sh (100%) rename {tests => test}/test-cdd39012.sh (100%) rename {tests => test}/test-cea75343.sh (100%) rename {tests => test}/test-chroot01.sh (100%) rename {tests => test}/test-commmmmm.sh (100%) rename {tests => test}/test-d1be631a.sh (100%) rename {tests => test}/test-d1da0d8d.sh (100%) rename {tests => test}/test-d2175fc3.sh (100%) rename {tests => test}/test-d2175fc4.c (100%) rename {tests => test}/test-d92b57ca.sh (100%) rename {tests => test}/test-dddddddd.sh (100%) rename {tests => test}/test-de756935.sh (100%) rename {tests => test}/test-df4de4db.sh (100%) rename {tests => test}/test-dfb0c3b6.sh (100%) rename {tests => test}/test-e87b34ae.c (100%) rename {tests => test}/test-e87ca6ca.sh (100%) rename {tests => test}/test-e940896f.sh (100%) rename {tests => test}/test-e99993c8.sh (100%) rename {tests => test}/test-eddeba0e.sh (100%) rename {tests => test}/test-f7089d4f.sh (100%) rename {tests => test}/test-fa205b56.c (100%) rename {tests => test}/test-fbca9cc2.sh (100%) rename {tests => test}/test-fdf487a0.c (100%) rename {tests => test}/test-ffffffff.sh (100%) rename {tests => test}/test-getres32.sh (100%) rename {tests => test}/test-getresid.sh (100%) rename {tests => test}/test-gggggggg.sh (100%) rename {tests => test}/test-hhhhhhhh.sh (100%) rename {tests => test}/test-iiiiiiii.c (100%) rename {tests => test}/test-killexit.sh (100%) rename {tests => test}/test-kkkkkkkk.c (100%) rename {tests => test}/test-mmmmmmmm.sh (100%) rename {tests => test}/test-nnnnnnnn.c (100%) rename {tests => test}/test-oooooooo.c (100%) rename {tests => test}/test-pppppppp.sh (100%) rename {tests => test}/test-proocare.sh (100%) rename {tests => test}/test-ptrace00.c (100%) rename {tests => test}/test-ptrace01.c (100%) rename {tests => test}/test-python01.sh (100%) rename {tests => test}/test-rrrrrrrr.sh (100%) rename {tests => test}/test-socket01.sh (100%) rename {tests => test}/test-socket02.sh (100%) rename {tests => test}/test-socket03.sh (100%) rename {tests => test}/test-ssssssss.c (100%) rename {tests => test}/test-tempdire.sh (100%) rename {tests => test}/test-wwwwwwww.sh (100%) rename {tests => test}/test-xxxxxxxx.c (100%) rename {tests => test}/test-yyyyyyyy.sh (100%) rename {tests => test}/true.c (100%) rename {tests => test}/validation.mk (100%) delete mode 100644 tests/GNUmakefile delete mode 100644 tests/sockets/tcpsockets.py delete mode 100644 tests/sockets/tcpsocketsipv6.py delete mode 100644 tests/sockets/testtcpsocket.sh delete mode 100644 tests/sockets/testtcpsocketauto.sh delete mode 100644 tests/sockets/testtcpsocketipv6.sh delete mode 100644 tests/test-77777777.c.unreliable diff --git a/.gitignore b/.gitignore index e8f7215..981db57 100644 --- a/.gitignore +++ b/.gitignore @@ -13,9 +13,9 @@ src/build.h src/care* src/loader* src/proot* -tests/* -!tests/*.sh.* -!tests/*.sh -!tests/*.c -!tests/*.py -!tests/*.mk +test/* +!test/*.sh.* +!test/*.sh +!test/*.c +!test/*.py +!test/*.mk diff --git a/tests/argv.c b/test/argv.c similarity index 100% rename from tests/argv.c rename to test/argv.c diff --git a/tests/argv0.c b/test/argv0.c similarity index 100% rename from tests/argv0.c rename to test/argv0.c diff --git a/tests/cat.c b/test/cat.c similarity index 100% rename from tests/cat.c rename to test/cat.c diff --git a/tests/chdir_getcwd.c b/test/chdir_getcwd.c similarity index 100% rename from tests/chdir_getcwd.c rename to test/chdir_getcwd.c diff --git a/tests/chroot.c b/test/chroot.c similarity index 100% rename from tests/chroot.c rename to test/chroot.c diff --git a/tests/echo.c b/test/echo.c similarity index 100% rename from tests/echo.c rename to test/echo.c diff --git a/tests/exec.c b/test/exec.c similarity index 100% rename from tests/exec.c rename to test/exec.c diff --git a/tests/false.c b/test/false.c similarity index 100% rename from tests/false.c rename to test/false.c diff --git a/tests/fchdir_getcwd.c b/test/fchdir_getcwd.c similarity index 100% rename from tests/fchdir_getcwd.c rename to test/fchdir_getcwd.c diff --git a/tests/fork-wait.c b/test/fork-wait.c similarity index 100% rename from tests/fork-wait.c rename to test/fork-wait.c diff --git a/tests/getresgid.c b/test/getresgid.c similarity index 100% rename from tests/getresgid.c rename to test/getresgid.c diff --git a/tests/getresuid.c b/test/getresuid.c similarity index 100% rename from tests/getresuid.c rename to test/getresuid.c diff --git a/tests/ptrace-2.c b/test/ptrace-2.c similarity index 100% rename from tests/ptrace-2.c rename to test/ptrace-2.c diff --git a/tests/ptrace.c b/test/ptrace.c similarity index 100% rename from tests/ptrace.c rename to test/ptrace.c diff --git a/tests/puts_proc_self_exe.c b/test/puts_proc_self_exe.c similarity index 100% rename from tests/puts_proc_self_exe.c rename to test/puts_proc_self_exe.c diff --git a/tests/pwd.c b/test/pwd.c similarity index 100% rename from tests/pwd.c rename to test/pwd.c diff --git a/tests/readdir.c b/test/readdir.c similarity index 100% rename from tests/readdir.c rename to test/readdir.c diff --git a/tests/readlink.c b/test/readlink.c similarity index 100% rename from tests/readlink.c rename to test/readlink.c diff --git a/tests/symlink.c b/test/symlink.c similarity index 100% rename from tests/symlink.c rename to test/symlink.c diff --git a/tests/test-00000000.sh b/test/test-00000000.sh similarity index 100% rename from tests/test-00000000.sh rename to test/test-00000000.sh diff --git a/tests/test-0228fbe7.sh b/test/test-0228fbe7.sh similarity index 100% rename from tests/test-0228fbe7.sh rename to test/test-0228fbe7.sh diff --git a/tests/test-0238c7f1.sh b/test/test-0238c7f1.sh similarity index 100% rename from tests/test-0238c7f1.sh rename to test/test-0238c7f1.sh diff --git a/tests/test-03969e70.sh b/test/test-03969e70.sh similarity index 100% rename from tests/test-03969e70.sh rename to test/test-03969e70.sh diff --git a/tests/test-071599da.sh b/test/test-071599da.sh similarity index 100% rename from tests/test-071599da.sh rename to test/test-071599da.sh diff --git a/tests/test-0830d8a8.sh b/test/test-0830d8a8.sh similarity index 100% rename from tests/test-0830d8a8.sh rename to test/test-0830d8a8.sh diff --git a/tests/test-092c5e26.sh b/test/test-092c5e26.sh similarity index 100% rename from tests/test-092c5e26.sh rename to test/test-092c5e26.sh diff --git a/tests/test-0cf405b0.c b/test/test-0cf405b0.c similarity index 100% rename from tests/test-0cf405b0.c rename to test/test-0cf405b0.c diff --git a/tests/test-11111111.sh b/test/test-11111111.sh similarity index 100% rename from tests/test-11111111.sh rename to test/test-11111111.sh diff --git a/tests/test-16573e73.c b/test/test-16573e73.c similarity index 100% rename from tests/test-16573e73.c rename to test/test-16573e73.c diff --git a/tests/test-1743dd3d.sh b/test/test-1743dd3d.sh similarity index 100% rename from tests/test-1743dd3d.sh rename to test/test-1743dd3d.sh diff --git a/tests/test-1c68c218.c b/test/test-1c68c218.c similarity index 100% rename from tests/test-1c68c218.c rename to test/test-1c68c218.c diff --git a/tests/test-1cd9d8f9.sh b/test/test-1cd9d8f9.sh similarity index 100% rename from tests/test-1cd9d8f9.sh rename to test/test-1cd9d8f9.sh diff --git a/tests/test-1fedd9a3.sh b/test/test-1fedd9a3.sh similarity index 100% rename from tests/test-1fedd9a3.sh rename to test/test-1fedd9a3.sh diff --git a/tests/test-1ffc8309.c b/test/test-1ffc8309.c similarity index 100% rename from tests/test-1ffc8309.c rename to test/test-1ffc8309.c diff --git a/tests/test-1ffc8309.sh b/test/test-1ffc8309.sh similarity index 100% rename from tests/test-1ffc8309.sh rename to test/test-1ffc8309.sh diff --git a/tests/test-22222222.sh b/test/test-22222222.sh similarity index 100% rename from tests/test-22222222.sh rename to test/test-22222222.sh diff --git a/tests/test-230f47cf.sh.disabled b/test/test-230f47cf.sh.disabled similarity index 100% rename from tests/test-230f47cf.sh.disabled rename to test/test-230f47cf.sh.disabled diff --git a/tests/test-230f47cg.sh.deprecated b/test/test-230f47cg.sh.deprecated similarity index 100% rename from tests/test-230f47cg.sh.deprecated rename to test/test-230f47cg.sh.deprecated diff --git a/tests/test-230f47ch.sh b/test/test-230f47ch.sh similarity index 100% rename from tests/test-230f47ch.sh rename to test/test-230f47ch.sh diff --git a/tests/test-2401b850.sh b/test/test-2401b850.sh similarity index 100% rename from tests/test-2401b850.sh rename to test/test-2401b850.sh diff --git a/tests/test-25069c12.c b/test/test-25069c12.c similarity index 100% rename from tests/test-25069c12.c rename to test/test-25069c12.c diff --git a/tests/test-25069c13.c b/test/test-25069c13.c similarity index 100% rename from tests/test-25069c13.c rename to test/test-25069c13.c diff --git a/tests/test-2db65cd2.sh b/test/test-2db65cd2.sh similarity index 100% rename from tests/test-2db65cd2.sh rename to test/test-2db65cd2.sh diff --git a/tests/test-305ae31d.c b/test/test-305ae31d.c similarity index 100% rename from tests/test-305ae31d.c rename to test/test-305ae31d.c diff --git a/tests/test-305ae31d.sh b/test/test-305ae31d.sh similarity index 100% rename from tests/test-305ae31d.sh rename to test/test-305ae31d.sh diff --git a/tests/test-311b7a95.sh b/test/test-311b7a95.sh similarity index 100% rename from tests/test-311b7a95.sh rename to test/test-311b7a95.sh diff --git a/tests/test-33333333.c b/test/test-33333333.c similarity index 100% rename from tests/test-33333333.c rename to test/test-33333333.c diff --git a/tests/test-33333334.c b/test/test-33333334.c similarity index 100% rename from tests/test-33333334.c rename to test/test-33333334.c diff --git a/tests/test-3624be91.sh b/test/test-3624be91.sh similarity index 100% rename from tests/test-3624be91.sh rename to test/test-3624be91.sh diff --git a/tests/test-3dec4597.sh b/test/test-3dec4597.sh similarity index 100% rename from tests/test-3dec4597.sh rename to test/test-3dec4597.sh diff --git a/tests/test-44444444.c b/test/test-44444444.c similarity index 100% rename from tests/test-44444444.c rename to test/test-44444444.c diff --git a/tests/test-517e1d6a.sh b/test/test-517e1d6a.sh similarity index 100% rename from tests/test-517e1d6a.sh rename to test/test-517e1d6a.sh diff --git a/tests/test-517e1d6b.sh b/test/test-517e1d6b.sh similarity index 100% rename from tests/test-517e1d6b.sh rename to test/test-517e1d6b.sh diff --git a/tests/test-51943658.c b/test/test-51943658.c similarity index 100% rename from tests/test-51943658.c rename to test/test-51943658.c diff --git a/tests/test-53355a5b.sh b/test/test-53355a5b.sh similarity index 100% rename from tests/test-53355a5b.sh rename to test/test-53355a5b.sh diff --git a/tests/test-5467b986.sh b/test/test-5467b986.sh similarity index 100% rename from tests/test-5467b986.sh rename to test/test-5467b986.sh diff --git a/tests/test-55b731d3.sh b/test/test-55b731d3.sh similarity index 100% rename from tests/test-55b731d3.sh rename to test/test-55b731d3.sh diff --git a/tests/test-55fd1da5.sh b/test/test-55fd1da5.sh similarity index 100% rename from tests/test-55fd1da5.sh rename to test/test-55fd1da5.sh diff --git a/tests/test-5996858d.sh b/test/test-5996858d.sh similarity index 100% rename from tests/test-5996858d.sh rename to test/test-5996858d.sh diff --git a/tests/test-5bed7141.c b/test/test-5bed7141.c similarity index 100% rename from tests/test-5bed7141.c rename to test/test-5bed7141.c diff --git a/tests/test-5bed7142.sh b/test/test-5bed7142.sh similarity index 100% rename from tests/test-5bed7142.sh rename to test/test-5bed7142.sh diff --git a/tests/test-5bed7143.c b/test/test-5bed7143.c similarity index 100% rename from tests/test-5bed7143.c rename to test/test-5bed7143.c diff --git a/tests/test-654decce.sh b/test/test-654decce.sh similarity index 100% rename from tests/test-654decce.sh rename to test/test-654decce.sh diff --git a/tests/test-66666666.c b/test/test-66666666.c similarity index 100% rename from tests/test-66666666.c rename to test/test-66666666.c diff --git a/tests/test-67972fbe.sh b/test/test-67972fbe.sh similarity index 100% rename from tests/test-67972fbe.sh rename to test/test-67972fbe.sh diff --git a/tests/test-691786c8.sh b/test/test-691786c8.sh similarity index 100% rename from tests/test-691786c8.sh rename to test/test-691786c8.sh diff --git a/tests/test-6b5a254a.sh b/test/test-6b5a254a.sh similarity index 100% rename from tests/test-6b5a254a.sh rename to test/test-6b5a254a.sh diff --git a/tests/test-6d1e2650.sh b/test/test-6d1e2650.sh similarity index 100% rename from tests/test-6d1e2650.sh rename to test/test-6d1e2650.sh diff --git a/tests/test-6fb08ce1.sh b/test/test-6fb08ce1.sh similarity index 100% rename from tests/test-6fb08ce1.sh rename to test/test-6fb08ce1.sh diff --git a/tests/test-713b6910.sh b/test/test-713b6910.sh similarity index 100% rename from tests/test-713b6910.sh rename to test/test-713b6910.sh diff --git a/tests/test-7601199b.sh b/test/test-7601199b.sh similarity index 100% rename from tests/test-7601199b.sh rename to test/test-7601199b.sh diff --git a/tests/test-79cf6614.c b/test/test-79cf6614.c similarity index 100% rename from tests/test-79cf6614.c rename to test/test-79cf6614.c diff --git a/tests/test-82ba4ba1.c b/test/test-82ba4ba1.c similarity index 100% rename from tests/test-82ba4ba1.c rename to test/test-82ba4ba1.c diff --git a/tests/test-82ba4ba1.sh b/test/test-82ba4ba1.sh similarity index 100% rename from tests/test-82ba4ba1.sh rename to test/test-82ba4ba1.sh diff --git a/tests/test-88888888.c b/test/test-88888888.c similarity index 100% rename from tests/test-88888888.c rename to test/test-88888888.c diff --git a/tests/test-8a83376a.sh b/test/test-8a83376a.sh similarity index 100% rename from tests/test-8a83376a.sh rename to test/test-8a83376a.sh diff --git a/tests/test-8e5fa256.sh b/test/test-8e5fa256.sh similarity index 100% rename from tests/test-8e5fa256.sh rename to test/test-8e5fa256.sh diff --git a/tests/test-99999999.sh b/test/test-99999999.sh similarity index 100% rename from tests/test-99999999.sh rename to test/test-99999999.sh diff --git a/tests/test-9c07fad8.c b/test/test-9c07fad8.c similarity index 100% rename from tests/test-9c07fad8.c rename to test/test-9c07fad8.c diff --git a/tests/test-9f5eeb72.sh b/test/test-9f5eeb72.sh similarity index 100% rename from tests/test-9f5eeb72.sh rename to test/test-9f5eeb72.sh diff --git a/tests/test-a3e68988.c b/test/test-a3e68988.c similarity index 100% rename from tests/test-a3e68988.c rename to test/test-a3e68988.c diff --git a/tests/test-a4d7ed70.sh b/test/test-a4d7ed70.sh similarity index 100% rename from tests/test-a4d7ed70.sh rename to test/test-a4d7ed70.sh diff --git a/tests/test-a8e69d6f.c b/test/test-a8e69d6f.c similarity index 100% rename from tests/test-a8e69d6f.c rename to test/test-a8e69d6f.c diff --git a/tests/test-aaaaaaaa.sh b/test/test-aaaaaaaa.sh similarity index 100% rename from tests/test-aaaaaaaa.sh rename to test/test-aaaaaaaa.sh diff --git a/tests/test-af062114.c b/test/test-af062114.c similarity index 100% rename from tests/test-af062114.c rename to test/test-af062114.c diff --git a/tests/test-b161bc0a.sh b/test/test-b161bc0a.sh similarity index 100% rename from tests/test-b161bc0a.sh rename to test/test-b161bc0a.sh diff --git a/tests/test-b6df3cbe.sh b/test/test-b6df3cbe.sh similarity index 100% rename from tests/test-b6df3cbe.sh rename to test/test-b6df3cbe.sh diff --git a/tests/test-b94dd86a.sh b/test/test-b94dd86a.sh similarity index 100% rename from tests/test-b94dd86a.sh rename to test/test-b94dd86a.sh diff --git a/tests/test-bbbbbbbb.sh b/test/test-bbbbbbbb.sh similarity index 100% rename from tests/test-bbbbbbbb.sh rename to test/test-bbbbbbbb.sh diff --git a/tests/test-bdc90417.c b/test/test-bdc90417.c similarity index 100% rename from tests/test-bdc90417.c rename to test/test-bdc90417.c diff --git a/tests/test-c10e2073.c b/test/test-c10e2073.c similarity index 100% rename from tests/test-c10e2073.c rename to test/test-c10e2073.c diff --git a/tests/test-c15999f9.sh b/test/test-c15999f9.sh similarity index 100% rename from tests/test-c15999f9.sh rename to test/test-c15999f9.sh diff --git a/tests/test-c47aeb7d.c b/test/test-c47aeb7d.c similarity index 100% rename from tests/test-c47aeb7d.c rename to test/test-c47aeb7d.c diff --git a/tests/test-c5a7a0f0.c b/test/test-c5a7a0f0.c similarity index 100% rename from tests/test-c5a7a0f0.c rename to test/test-c5a7a0f0.c diff --git a/tests/test-c68d18dc.sh b/test/test-c68d18dc.sh similarity index 100% rename from tests/test-c68d18dc.sh rename to test/test-c68d18dc.sh diff --git a/tests/test-c6b77b77.mk b/test/test-c6b77b77.mk similarity index 100% rename from tests/test-c6b77b77.mk rename to test/test-c6b77b77.mk diff --git a/tests/test-c6b77b77.sh b/test/test-c6b77b77.sh similarity index 100% rename from tests/test-c6b77b77.sh rename to test/test-c6b77b77.sh diff --git a/tests/test-careauth.sh b/test/test-careauth.sh similarity index 100% rename from tests/test-careauth.sh rename to test/test-careauth.sh diff --git a/tests/test-careexit.sh b/test/test-careexit.sh similarity index 100% rename from tests/test-careexit.sh rename to test/test-careexit.sh diff --git a/tests/test-carehwcp.sh b/test/test-carehwcp.sh similarity index 100% rename from tests/test-carehwcp.sh rename to test/test-carehwcp.sh diff --git a/tests/test-carequot.sh b/test/test-carequot.sh similarity index 100% rename from tests/test-carequot.sh rename to test/test-carequot.sh diff --git a/tests/test-cb1143ab.sh b/test/test-cb1143ab.sh similarity index 100% rename from tests/test-cb1143ab.sh rename to test/test-cb1143ab.sh diff --git a/tests/test-cccccccc.sh b/test/test-cccccccc.sh similarity index 100% rename from tests/test-cccccccc.sh rename to test/test-cccccccc.sh diff --git a/tests/test-cdd39012.sh b/test/test-cdd39012.sh similarity index 100% rename from tests/test-cdd39012.sh rename to test/test-cdd39012.sh diff --git a/tests/test-cea75343.sh b/test/test-cea75343.sh similarity index 100% rename from tests/test-cea75343.sh rename to test/test-cea75343.sh diff --git a/tests/test-chroot01.sh b/test/test-chroot01.sh similarity index 100% rename from tests/test-chroot01.sh rename to test/test-chroot01.sh diff --git a/tests/test-commmmmm.sh b/test/test-commmmmm.sh similarity index 100% rename from tests/test-commmmmm.sh rename to test/test-commmmmm.sh diff --git a/tests/test-d1be631a.sh b/test/test-d1be631a.sh similarity index 100% rename from tests/test-d1be631a.sh rename to test/test-d1be631a.sh diff --git a/tests/test-d1da0d8d.sh b/test/test-d1da0d8d.sh similarity index 100% rename from tests/test-d1da0d8d.sh rename to test/test-d1da0d8d.sh diff --git a/tests/test-d2175fc3.sh b/test/test-d2175fc3.sh similarity index 100% rename from tests/test-d2175fc3.sh rename to test/test-d2175fc3.sh diff --git a/tests/test-d2175fc4.c b/test/test-d2175fc4.c similarity index 100% rename from tests/test-d2175fc4.c rename to test/test-d2175fc4.c diff --git a/tests/test-d92b57ca.sh b/test/test-d92b57ca.sh similarity index 100% rename from tests/test-d92b57ca.sh rename to test/test-d92b57ca.sh diff --git a/tests/test-dddddddd.sh b/test/test-dddddddd.sh similarity index 100% rename from tests/test-dddddddd.sh rename to test/test-dddddddd.sh diff --git a/tests/test-de756935.sh b/test/test-de756935.sh similarity index 100% rename from tests/test-de756935.sh rename to test/test-de756935.sh diff --git a/tests/test-df4de4db.sh b/test/test-df4de4db.sh similarity index 100% rename from tests/test-df4de4db.sh rename to test/test-df4de4db.sh diff --git a/tests/test-dfb0c3b6.sh b/test/test-dfb0c3b6.sh similarity index 100% rename from tests/test-dfb0c3b6.sh rename to test/test-dfb0c3b6.sh diff --git a/tests/test-e87b34ae.c b/test/test-e87b34ae.c similarity index 100% rename from tests/test-e87b34ae.c rename to test/test-e87b34ae.c diff --git a/tests/test-e87ca6ca.sh b/test/test-e87ca6ca.sh similarity index 100% rename from tests/test-e87ca6ca.sh rename to test/test-e87ca6ca.sh diff --git a/tests/test-e940896f.sh b/test/test-e940896f.sh similarity index 100% rename from tests/test-e940896f.sh rename to test/test-e940896f.sh diff --git a/tests/test-e99993c8.sh b/test/test-e99993c8.sh similarity index 100% rename from tests/test-e99993c8.sh rename to test/test-e99993c8.sh diff --git a/tests/test-eddeba0e.sh b/test/test-eddeba0e.sh similarity index 100% rename from tests/test-eddeba0e.sh rename to test/test-eddeba0e.sh diff --git a/tests/test-f7089d4f.sh b/test/test-f7089d4f.sh similarity index 100% rename from tests/test-f7089d4f.sh rename to test/test-f7089d4f.sh diff --git a/tests/test-fa205b56.c b/test/test-fa205b56.c similarity index 100% rename from tests/test-fa205b56.c rename to test/test-fa205b56.c diff --git a/tests/test-fbca9cc2.sh b/test/test-fbca9cc2.sh similarity index 100% rename from tests/test-fbca9cc2.sh rename to test/test-fbca9cc2.sh diff --git a/tests/test-fdf487a0.c b/test/test-fdf487a0.c similarity index 100% rename from tests/test-fdf487a0.c rename to test/test-fdf487a0.c diff --git a/tests/test-ffffffff.sh b/test/test-ffffffff.sh similarity index 100% rename from tests/test-ffffffff.sh rename to test/test-ffffffff.sh diff --git a/tests/test-getres32.sh b/test/test-getres32.sh similarity index 100% rename from tests/test-getres32.sh rename to test/test-getres32.sh diff --git a/tests/test-getresid.sh b/test/test-getresid.sh similarity index 100% rename from tests/test-getresid.sh rename to test/test-getresid.sh diff --git a/tests/test-gggggggg.sh b/test/test-gggggggg.sh similarity index 100% rename from tests/test-gggggggg.sh rename to test/test-gggggggg.sh diff --git a/tests/test-hhhhhhhh.sh b/test/test-hhhhhhhh.sh similarity index 100% rename from tests/test-hhhhhhhh.sh rename to test/test-hhhhhhhh.sh diff --git a/tests/test-iiiiiiii.c b/test/test-iiiiiiii.c similarity index 100% rename from tests/test-iiiiiiii.c rename to test/test-iiiiiiii.c diff --git a/tests/test-killexit.sh b/test/test-killexit.sh similarity index 100% rename from tests/test-killexit.sh rename to test/test-killexit.sh diff --git a/tests/test-kkkkkkkk.c b/test/test-kkkkkkkk.c similarity index 100% rename from tests/test-kkkkkkkk.c rename to test/test-kkkkkkkk.c diff --git a/tests/test-mmmmmmmm.sh b/test/test-mmmmmmmm.sh similarity index 100% rename from tests/test-mmmmmmmm.sh rename to test/test-mmmmmmmm.sh diff --git a/tests/test-nnnnnnnn.c b/test/test-nnnnnnnn.c similarity index 100% rename from tests/test-nnnnnnnn.c rename to test/test-nnnnnnnn.c diff --git a/tests/test-oooooooo.c b/test/test-oooooooo.c similarity index 100% rename from tests/test-oooooooo.c rename to test/test-oooooooo.c diff --git a/tests/test-pppppppp.sh b/test/test-pppppppp.sh similarity index 100% rename from tests/test-pppppppp.sh rename to test/test-pppppppp.sh diff --git a/tests/test-proocare.sh b/test/test-proocare.sh similarity index 100% rename from tests/test-proocare.sh rename to test/test-proocare.sh diff --git a/tests/test-ptrace00.c b/test/test-ptrace00.c similarity index 100% rename from tests/test-ptrace00.c rename to test/test-ptrace00.c diff --git a/tests/test-ptrace01.c b/test/test-ptrace01.c similarity index 100% rename from tests/test-ptrace01.c rename to test/test-ptrace01.c diff --git a/tests/test-python01.sh b/test/test-python01.sh similarity index 100% rename from tests/test-python01.sh rename to test/test-python01.sh diff --git a/tests/test-rrrrrrrr.sh b/test/test-rrrrrrrr.sh similarity index 100% rename from tests/test-rrrrrrrr.sh rename to test/test-rrrrrrrr.sh diff --git a/tests/test-socket01.sh b/test/test-socket01.sh similarity index 100% rename from tests/test-socket01.sh rename to test/test-socket01.sh diff --git a/tests/test-socket02.sh b/test/test-socket02.sh similarity index 100% rename from tests/test-socket02.sh rename to test/test-socket02.sh diff --git a/tests/test-socket03.sh b/test/test-socket03.sh similarity index 100% rename from tests/test-socket03.sh rename to test/test-socket03.sh diff --git a/tests/test-ssssssss.c b/test/test-ssssssss.c similarity index 100% rename from tests/test-ssssssss.c rename to test/test-ssssssss.c diff --git a/tests/test-tempdire.sh b/test/test-tempdire.sh similarity index 100% rename from tests/test-tempdire.sh rename to test/test-tempdire.sh diff --git a/tests/test-wwwwwwww.sh b/test/test-wwwwwwww.sh similarity index 100% rename from tests/test-wwwwwwww.sh rename to test/test-wwwwwwww.sh diff --git a/tests/test-xxxxxxxx.c b/test/test-xxxxxxxx.c similarity index 100% rename from tests/test-xxxxxxxx.c rename to test/test-xxxxxxxx.c diff --git a/tests/test-yyyyyyyy.sh b/test/test-yyyyyyyy.sh similarity index 100% rename from tests/test-yyyyyyyy.sh rename to test/test-yyyyyyyy.sh diff --git a/tests/true.c b/test/true.c similarity index 100% rename from tests/true.c rename to test/true.c diff --git a/tests/validation.mk b/test/validation.mk similarity index 100% rename from tests/validation.mk rename to test/validation.mk diff --git a/tests/GNUmakefile b/tests/GNUmakefile deleted file mode 100644 index d523299..0000000 --- a/tests/GNUmakefile +++ /dev/null @@ -1,220 +0,0 @@ -DIR = $(dir $(abspath $(firstword $(MAKEFILE_LIST)))) -ROOTFS = $(DIR)/rootfs -PROOT = $(DIR)/../src/proot -CARE = $(DIR)/../src/care -CC = gcc -PROOT_RAW = $(PROOT) - -CHECK_TESTS = $(patsubst %,check-%, $(wildcard test-*.sh) $(wildcard test-*.c)) - -.PHONY: check clean_failure check_failure setup check-% - -check: | clean_failure check_failure - -memcheck: PROOT_RAW := $(PROOT) -memcheck: PROOT := $(shell which valgrind) -q --error-exitcode=1 $(PROOT) -memcheck: check - -clean_failure: - @rm -f failure - -check_failure: $(CHECK_TESTS) - @bash -c '! test -e failure' - -check-%.sh: %.sh setup - $(Q)env CARE="$(CARE)" PROOT_RAW="$(PROOT_RAW)" PROOT="$(PROOT)" ROOTFS=$(ROOTFS) sh -ex $< $(silently); $(call check,$*) - -check-%.c: $(ROOTFS)/bin/% setup - $(call check_c,$*,$(PROOT) -b /proc -r $(ROOTFS) /bin/$*) - -# Special cases. -check-test-bdc90417.c: test-bdc90417 - $(call check_c,$<,$(PROOT) -w . ./$<) - -# Not supported anymore. -# check-test-af062114.c: test-af062114 -# $(call check_c,$<,$(PROOT) -v -1 -q /bin/true -b . -b /lib -b /lib64 -b /proc -r $(ROOTFS) ./$< | grep -- --inhibit-rpath) -# $(call check_c,$<,$(PROOT) -v -1 -q /bin/true / ./$< | grep '^./$<') deprecated - -check-test-5bed7141.c: test-5bed7141 - $(call check_c,$<,$(PROOT) ./$<) - -check-test-5bed7143.c: test-5bed7143 - $(call check_c,$<,$(PROOT) -r $(ROOTFS) -b . ./$<) - $(call check_c,$<,$(PROOT) ./$<) - -check-test-16573e73.c: test-16573e73 - $(call check_c,$<,$(PROOT) ./$<) - $(call check_c,$<,$(PROOT) ./$< 1) - -check-test-82ba4ba1.c: test-82ba4ba1 - $(call check_c,$<,$(PROOT) -0 ./$<) - $(call check_c,$<,! $(PROOT) -i 123:456 ./$<) - -check-test-kkkkkkkk.c: test-kkkkkkkk - $(call check_c,$<,$(PROOT) ./$<) - -check-test-25069c12.c: test-25069c12 - $(call check_c,$<,$(PROOT) ./$<) - -check-test-25069c13.c: test-25069c13 - $(call check_c,$<,$(PROOT) ./$<) - -check-test-1ffc8309.c: test-1ffc8309 - $(call check_c,$<,env PROOT_FORCE_KOMPAT=1 $(PROOT) -k $(shell uname -r) ./$<) - -check-test-c5a7a0f0.c: test-c5a7a0f0 - $(call check_c,$<,$(PROOT) -0 ./$<) - $(call check_c,$<,! $(PROOT) -i 123:456 ./$<) - -check-test-a3e68988.c: test-a3e68988 - @which gdb >/dev/null 2>&1 || rm -f $< - $(call check_c,$<,$(PROOT) gdb -return-child-result -ex run -ex quit ./$<) - -check-test-c47aeb7d.c: test-c47aeb7d - @which gdb >/dev/null 2>&1 || rm -f $< - $(call check_c,$<,$(PROOT) gdb -return-child-result -ex run -ex quit ./$<) - -check-test-fdf487a0.c: test-fdf487a0 - $(call check_c,$<,echo test | $(PROOT) ./$<) - -check-test-iiiiiiii.c: test-iiiiiiii - $(call check_c,$<,echo test | env PROOT_DONT_POLLUTE_ROOTFS=1 $(PROOT) -b /bin:/this_shall_not_exist_outside_proot ./$<) - -check-test-9c07fad8.c: test-9c07fad8 - $(call check_c,$<,$(PROOT) ./$<) - -check-test-fa205b56.c: test-fa205b56 - $(call check_c,$<,$(PROOT) ./$<) - -check_c = $(Q)if [ -e $< ]; then \ - $(2) $(silently); $(call check,$(1)) \ - else \ - echo " CHECK $(1) skipped"; \ - fi - -check = case "$$?" in \ - 0) echo " CHECK $(1) ok";; \ - 125) echo " CHECK $(1) skipped";; \ - *) echo " CHECK $(1) FAILED"; \ - touch failure ;; \ - esac - -###################################################################### -# Build a clean rootfs - -ROOTFS_BIN = $(ROOTFS)/bin/true $(ROOTFS)/bin/false \ - $(ROOTFS)/bin/pwd $(ROOTFS)/bin/readlink $(ROOTFS)/bin/symlink \ - $(ROOTFS)/bin/abs-true $(ROOTFS)/bin/rel-true $(ROOTFS)/bin/echo \ - $(ROOTFS)/bin/argv0 $(ROOTFS)/bin/readdir $(ROOTFS)/bin/cat \ - $(ROOTFS)/bin/chdir_getcwd $(ROOTFS)/bin/fchdir_getcwd $(ROOTFS)/bin/argv \ - $(ROOTFS)/bin/fork-wait $(ROOTFS)/bin/ptrace $(ROOTFS)/bin/ptrace-2 \ - $(ROOTFS)/bin/puts_proc_self_exe $(ROOTFS)/bin/exec $(ROOTFS)/bin/exec-m32 \ - $(ROOTFS)/bin/exec-suid $(ROOTFS)/bin/exec-sgid $(ROOTFS)/bin/exec-m32-suid \ - $(ROOTFS)/bin/exec-m32-sgid $(ROOTFS)/bin/getresuid $(ROOTFS)/bin/getresgid \ - $(ROOTFS)/bin/chroot - -ROOTFS_DIR = $(ROOTFS)/bin $(ROOTFS)/tmp - -$(ROOTFS_BIN): | $(ROOTFS_DIR) - -$(ROOTFS_DIR): - @mkdir -p $@ - -setup: $(ROOTFS_BIN) - -$(ROOTFS)/bin/abs-true: - $(Q)ln -fs $$(which true) $@ - -$(ROOTFS)/bin/rel-true: - $(Q)ln -fs ./true $@ - -$(ROOTFS)/bin/exec-m32: exec.c - $(Q)$(CC) -m32 -static $^ -o $@ $(silently) || true - -$(ROOTFS)/bin/exec-suid: $(ROOTFS)/bin/exec - $(Q)cp $^ $@ - $(Q)chmod u+s $@ - -$(ROOTFS)/bin/exec-sgid: $(ROOTFS)/bin/exec - $(Q)cp $^ $@ - $(Q)chmod g+s $@ - -$(ROOTFS)/bin/exec-m32-suid: $(ROOTFS)/bin/exec-m32 - $(Q)cp $^ $@ $(silently) || true - $(Q)chmod u+s $@ $(silently) || true - -$(ROOTFS)/bin/exec-m32-sgid: $(ROOTFS)/bin/exec-m32 - $(Q)cp $^ $@ $(silently) || true - $(Q)chmod g+s $@ $(silently) || true - -.SECONDARY: $(patsubst %.c,$(ROOTFS)/bin/%, $(wildcard test-*.c)) -$(ROOTFS)/bin/%: %.c - $(Q)$(CC) -static $*.c -o $@ $(silently) || true - -# Special cases. -test-bdc90417: test-bdc90417.c - $(Q)$(CC) $< -o $@ $(silently) || true - -# Not supported anymore. -# test-af062114: test-af062114.c -# $(Q)$(CC) $< -Wl,-rpath=foo -o $@ $(silently) || true - -test-5bed7141: test-5bed7141.c - $(Q)$(CC) $< -pthread -static -o $@ $(silently) || true - -test-16573e73: test-16573e73.c - $(Q)$(CC) $< -static -o $@ $(silently) || true - -test-82ba4ba1: test-82ba4ba1.c - $(Q)$(CC) $< -o $@ $(silently) || true - -test-kkkkkkkk: test-kkkkkkkk.c - $(Q)$(CC) $< -o $@ $(silently) || true - -test-25069c12: test-25069c12.c - $(Q)$(CC) $< -o $@ $(silently) || true - -test-25069c13: test-25069c13.c - $(Q)$(CC) $< -o $@ $(silently) || true - -test-5bed7143: test-5bed7143.c - $(Q)$(CC) $< -static -o $@ $(silently) || true - -test-1ffc8309: test-1ffc8309.c - $(Q)$(CC) $< -o $@ $(silently) || true - -test-c5a7a0f0: test-c5a7a0f0.c - $(Q)$(CC) $< -pthread -static -o $@ $(silently) || true - -test-a3e68988: test-a3e68988.c - $(Q)$(CC) $< -o $@ $(silently) || true - -test-fdf487a0: test-fdf487a0.c - $(Q)$(CC) $< -o $@ $(silently) || true - -test-iiiiiiii: test-iiiiiiii.c - $(Q)$(CC) $< -o $@ $(silently) || true - -test-9c07fad8: test-9c07fad8.c - $(Q)$(CC) -fPIE -pie $< -o $@ $(silently) || true - -test-fa205b56: test-fa205b56.c - $(Q)$(CC) $< -pthread -o $@ $(silently) || true - -test-c47aeb7d: test-c47aeb7d.c - $(Q)$(CC) $< -pthread -o $@ $(silently) || true - -###################################################################### -# Beautified output - -V = 0 -ifeq ($(V), 0) - quiet = quiet_ - Q = @ - silently = >/dev/null 2>&1 -else - quiet = - Q = - silently = -endif diff --git a/tests/sockets/tcpsockets.py b/tests/sockets/tcpsockets.py deleted file mode 100644 index 2daffaf..0000000 --- a/tests/sockets/tcpsockets.py +++ /dev/null @@ -1,75 +0,0 @@ -import socket -import sys -import os -import time - -HOST = 'localhost' -PORT = 5432 - -pid = os.fork() - -# Server -if pid: - - # Create syscall - sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) - - if len(sys.argv) > 1: - time.sleep(int(sys.argv[1])) - - # Bind syscall - print "Server bind" - sock.bind((HOST, PORT)) - - # Listen syscall - print "Server listen" - sock.listen(1) - - try: - # Accept syscall - print "Server accept" - conn, addr = sock.accept() - - while True: - data = conn.recv(1024) - if not data: - break - else: - #if len(sys.argv) > 4: - # with open("fakeoutput" + sys.argv[4] + ".txt", "a") as testfile: - # testfile.write(data) - # os.remove("fakeoutput" + sys.argv[4] + ".txt") - print "Server data received : " + data - break - finally: - # Close syscall - sock.close() - -# Client -else: - - # Socket syscall - sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) - - if len(sys.argv) > 2: - time.sleep(int(sys.argv[2])) - - try: - # Connect syscall - print "Client connect" - sock.connect((HOST, PORT)) - except socket.error, msg: - print >>sys.stderr, msg - sys.exit(1) - - if len(sys.argv) > 3: - time.sleep(int(sys.argv[3])) - - try: - # send Syscall - if len(sys.argv) > 4: - sock.send("test " + sys.argv[4]) - else: - sock.send("test") - finally: - sock.close() diff --git a/tests/sockets/tcpsocketsipv6.py b/tests/sockets/tcpsocketsipv6.py deleted file mode 100644 index c3da21c..0000000 --- a/tests/sockets/tcpsocketsipv6.py +++ /dev/null @@ -1,74 +0,0 @@ -import socket -import sys -import os -import time - -HOST = '::1' -PORT = 6432 - -pid = os.fork() -addrs = socket.getaddrinfo(HOST, PORT, socket.AF_INET6, 0, socket.SOL_TCP)[0][-1] -#addrs = (HOST, PORT) -print addrs - -# Server -if pid: - - # Create syscall - sock = socket.socket(socket.AF_INET6, socket.SOCK_STREAM) - - if len(sys.argv) > 1: - time.sleep(int(sys.argv[1])) - - # Bind syscall - print "Server bind" - sock.bind(addrs) - - # Listen syscall - print "Server listen" - sock.listen(1) - - try: - # Accept syscall - print "Server accept" - conn, addr = sock.accept() - - while True: - data = conn.recv(1024) - if not data: - break - else: - #if len(sys.argv) > 4: - # with open("fakeoutput" + sys.argv[4] + ".txt", "a") as testfile: - # testfile.write(data) - # os.remove("fakeoutput" + sys.argv[4] + ".txt") - print "Server data received : " + data - break - finally: - # Close syscall - sock.close() - -# Client -else: - # Socket syscall - sock = socket.socket(socket.AF_INET6, socket.SOCK_STREAM) - - if len(sys.argv) > 2: - time.sleep(int(sys.argv[2])) - - try: - # Connect syscall - print "Client connect" - sock.connect(addrs) - except socket.error, msg: - print >>sys.stderr, msg - sys.exit(1) - - if len(sys.argv) > 3: - time.sleep(int(sys.argv[3])) - - try: - # send Syscall - sock.send("test " + sys.argv[4]) - finally: - sock.close() diff --git a/tests/sockets/testtcpsocket.sh b/tests/sockets/testtcpsocket.sh deleted file mode 100644 index 5586dd8..0000000 --- a/tests/sockets/testtcpsocket.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh - -# $1: instance id, -# $2: waiting time before server binding -# $3: waiting time before client connecting -# $4: client waiting time before sending message -start_ips_program() { - ../../src/proot -v 1 -p $1 python tcpsockets.py $2 $3 $4 $1 -} - -# Instance 1: bind connect send&close -# Instance 2: bind connect send&close - -start_ips_program 5432:54320 1 3 1 & -start_ips_program 5432:54321 2 3 1 -#start_ips_program 10 0 1 0 - -# If PRoot allows these two processes to proceed without errors, the test passes. -# Without the -p option, they cannot be run at the same time because they use the same port. diff --git a/tests/sockets/testtcpsocketauto.sh b/tests/sockets/testtcpsocketauto.sh deleted file mode 100644 index 6397544..0000000 --- a/tests/sockets/testtcpsocketauto.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh - -# $1: instance id, -# $2: waiting time before server binding -# $3: waiting time before client connecting -# $4: client waiting time before sending message -start_ips_program() { - ../../src/proot -v 1 -n python tcpsockets.py $1 $2 $3 -} - -# Instance 1: bind connect send&close -# Instance 2: bind connect send&close - -start_ips_program 1 3 1 & -start_ips_program 2 3 1 -#start_ips_program 10 0 1 0 - -# If PRoot allows these two processes to proceed without errors, the test passes. -# Without the -n option, they cannot be run at the same time because they use the same port. diff --git a/tests/sockets/testtcpsocketipv6.sh b/tests/sockets/testtcpsocketipv6.sh deleted file mode 100644 index c7a38ac..0000000 --- a/tests/sockets/testtcpsocketipv6.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh - -# $1: instance id, -# $2: waiting time before server binding -# $3: waiting time before client connecting -# $4: client waiting time before sending message -start_ips_program() { - ../../src/proot -p $1 python tcpsocketsipv6.py $2 $3 $4 $1 -} - -# Instance 1: bind connect send&close -# Instance 2: bind connect send&close - -start_ips_program 6432:56320 1 3 1 & -start_ips_program 6432:56321 2 3 1 -#start_ips_program 10 0 1 0 - -# If PRoot allows these two processes to proceed without errors, the test passes. -# Without the -p option, they cannot be run at the same time because their share the same unix socket filename. diff --git a/tests/test-77777777.c.unreliable b/tests/test-77777777.c.unreliable deleted file mode 100644 index 09683cb..0000000 --- a/tests/test-77777777.c.unreliable +++ /dev/null @@ -1,51 +0,0 @@ -#include -#include -#include -#include -#include -#include - -int main() -{ - int child_status; - int status; - pid_t pid; - - pid = fork(); - switch (pid) { - case -1: - perror("fork()"); - exit(EXIT_FAILURE); - - case 0: /* child */ - status = raise(SIGSTOP); - if (status != 0) { - perror("raise(SIGSTOP)"); - exit(EXIT_FAILURE); - } - sleep(1); - exit(EXIT_FAILURE); - - default: /* parent */ - status = waitpid(pid, &child_status, WUNTRACED); - if (status < 0) { - perror("waitpid()"); - exit(EXIT_FAILURE); - } - - if (WIFEXITED(child_status)) - printf("exited, status=%d\n", WEXITSTATUS(child_status)); - else if (WIFSIGNALED(child_status)) - printf("killed by signal %d\n", WTERMSIG(child_status)); - else if (WIFSTOPPED(child_status)) - printf("stopped by signal %d\n", WSTOPSIG(child_status)); - else if (WIFCONTINUED(child_status)) - printf("continued\n"); - - if (WIFSTOPPED(child_status)) - exit(EXIT_SUCCESS); - else - exit(EXIT_FAILURE); - } -} -