tests: cleanup checks for basic programs

* tests/init.sh: Check for cat and rm.
* tests/getdents.test: Check for awk.
* tests/ptrace_setoptions.test: Check for grep.
* tests/net-fd.test: Do not check for rm.
* tests/net.test: Likewise.
* tests/scm_rights-fd.test: Likewise.
* tests/stat.test: Likewise.
* tests/uio.test: Likewise.

diff --git a/tests/count.test b/tests/count.test
index e9eafd91092320200326fcdebae103aa83408dff..b94eebae1274f517e3458f4b17b708931bea7c26 100755 (executable)
--- a/tests/count.test
+++ b/tests/count.test
@@ -4,8 +4,8 @@
 
 . "${srcdir=.}/init.sh"
 
-check_prog sleep
 check_prog grep
+check_prog sleep
 
 make_log()
 {

diff --git a/tests/detach-running.test b/tests/detach-running.test
index e3b33f9c1dffee9312e407eeaeaef756e930abda..3b607d8be96e4ea1b6a0728e33201e33a0fe3e1d 100755 (executable)
--- a/tests/detach-running.test
+++ b/tests/detach-running.test
@@ -4,8 +4,8 @@
 
 . "${srcdir=.}/init.sh"
 
-check_prog sleep
 check_prog grep
+check_prog sleep
 
 set -e
 

diff --git a/tests/detach-sleeping.test b/tests/detach-sleeping.test
index 241d51576e206b13c950dc3cee5d2cc250c77370..571c345ea45f407d12e51c914342817d2bbc0b61 100755 (executable)
--- a/tests/detach-sleeping.test
+++ b/tests/detach-sleeping.test
@@ -4,8 +4,8 @@
 
 . "${srcdir=.}/init.sh"
 
-check_prog sleep
 check_prog grep
+check_prog sleep
 
 set -e
 

diff --git a/tests/detach-stopped.test b/tests/detach-stopped.test
index c41bc04729df8eadf25f4d0e2b66ce280c9cecf2..b5cf364bc81115b9c4c99c19799195ff9ae8a889 100755 (executable)
--- a/tests/detach-stopped.test
+++ b/tests/detach-stopped.test
@@ -4,8 +4,8 @@
 
 . "${srcdir=.}/init.sh"
 
-check_prog sleep
 check_prog grep
+check_prog sleep
 
 $STRACE -d -enone / > /dev/null 2> $LOG
 if grep -F -x "PTRACE_SEIZE doesn't work" $LOG > /dev/null; then

diff --git a/tests/getdents.test b/tests/getdents.test
index 7fb81b839e798c2311539aa9445740702b1a49f0..5f86ac16654e90268a1934c00ea71b6702494868 100755 (executable)
--- a/tests/getdents.test
+++ b/tests/getdents.test
@@ -4,6 +4,7 @@
 
 . "${srcdir=.}/init.sh"
 
+check_prog awk
 check_prog grep
 check_prog ls
 check_prog mkdir

diff --git a/tests/init.sh b/tests/init.sh
index 3976a1eafc687d6409e13e1b6c10bd68410c2fb4..418272b86bff9952cee525869976c8ced10888eb 100644 (file)
--- a/tests/init.sh
+++ b/tests/init.sh
@@ -2,9 +2,6 @@
 
 ME_="${0##*/}"
 
-LOG="$ME_.tmp"
-rm -f "$LOG"
-
 warn_() { printf >&2 '%s\n' "$*"; }
 fail_() { warn_ "$ME_: failed test: $*"; exit 1; }
 skip_() { warn_ "$ME_: skipped test: $*"; exit 77; }
@@ -17,6 +14,12 @@ check_prog()
                framework_skip_ "$* is not available"
 }
 
+check_prog cat
+check_prog rm
+
+LOG="$ME_.tmp"
+rm -f "$LOG"
+
 : "${STRACE:=../strace}"
 : "${TIMEOUT_DURATION:=60}"
 : "${SLEEP_A_BIT:=sleep 1}"

diff --git a/tests/net-fd.test b/tests/net-fd.test
index fc0d3cd0649e4eab8974bcb42f041af048a61c28..0f0eb5ccf43eb0b3b15a990f4ab1d24c51168327 100755 (executable)
--- a/tests/net-fd.test
+++ b/tests/net-fd.test
@@ -9,7 +9,6 @@
        framework_skip_ '/proc/self/fd/ is not available'
 
 check_prog grep
-check_prog rm
 
 rm -f $LOG.*
 

diff --git a/tests/net-yy.test b/tests/net-yy.test
index 8b6c0982729a344c91da44c40f0e54e77bb0ddb4..85c2ede2a25505aa32fc5af8b1319a29e63957d7 100755 (executable)
--- a/tests/net-yy.test
+++ b/tests/net-yy.test
@@ -8,8 +8,8 @@
 [ -d /proc/self/fd/ ] ||
        framework_skip_ '/proc/self/fd/ is not available'
 
-check_prog sed
 check_prog awk
+check_prog sed
 
 rm -f $LOG.* $LOG-*
 

diff --git a/tests/net.test b/tests/net.test
index de1dae14afe0c43017228c9ed4db1bb955e59c30..f0eff0c1af2047478f8c7479b9c642f05fe35209 100755 (executable)
--- a/tests/net.test
+++ b/tests/net.test
@@ -5,7 +5,6 @@
 . "${srcdir=.}/init.sh"
 
 check_prog grep
-check_prog rm
 
 rm -f $LOG.*
 

diff --git a/tests/ptrace_setoptions.test b/tests/ptrace_setoptions.test
index e574e24ae6e4c217d1f198f16e8df47cdcc05f2f..87651b8038d887ed842aa2a9ff3264a450242f5b 100755 (executable)
--- a/tests/ptrace_setoptions.test
+++ b/tests/ptrace_setoptions.test
@@ -5,6 +5,8 @@
 
 . "${srcdir=.}/init.sh"
 
+check_prog grep
+
 [ "$(uname -s)" = Linux ] ||
        skip_ 'The kernel is not a Linux kernel'
 case "$(uname -r)" in

diff --git a/tests/scm_rights-fd.test b/tests/scm_rights-fd.test
index 5a847dac5b27e6ea742092999ac7a088c3f5db55..ecf447509632465b35d34f0f3cf51c1bde66649a 100755 (executable)
--- a/tests/scm_rights-fd.test
+++ b/tests/scm_rights-fd.test
@@ -9,7 +9,6 @@
        framework_skip_ '/proc/self/fd/ is not available'
 
 check_prog grep
-check_prog rm
 
 rm -f $LOG.*
 

diff --git a/tests/stat.test b/tests/stat.test
index 4176df0edb6f2cb69473161264fea5a86d6ace5c..5c2a5780fe2b357072b04f268d8b350be91d5d80 100755 (executable)
--- a/tests/stat.test
+++ b/tests/stat.test
@@ -7,7 +7,6 @@
 check_prog dd
 check_prog find
 check_prog grep
-check_prog rm
 
 umask 022
 truncate_cmd='dd seek=46118400000 obs=1 count=0 if=/dev/null of=sample'

diff --git a/tests/uio.test b/tests/uio.test
index 313761f5019feb0dbae95bfa0fffe2cc13c9ed0d..0e8b31550cccc966588937ed44f81ff5800d039b 100755 (executable)
--- a/tests/uio.test
+++ b/tests/uio.test
@@ -5,7 +5,6 @@
 . "${srcdir=.}/init.sh"
 
 check_prog grep
-check_prog rm
 
 ./uio || {
        if [ $? -eq 77 ]; then