func: add more traps

This commit is contained in:
Louis Abel 2023-11-21 01:23:44 -07:00
parent 94cb5741e2
commit 47c64bbd74
Signed by untrusted user: label
GPG Key ID: B37E62D143879B36
11 changed files with 14 additions and 19 deletions

View File

@ -1,5 +1,6 @@
#!/bin/bash #!/bin/bash
r_log "coreutils" "Testing cat" r_log "coreutils" "Testing cat"
trap "/bin/rm /var/tmp/cattest" EXIT
cat > /var/tmp/cattest <<EOF cat > /var/tmp/cattest <<EOF
Green Obsidian Green Obsidian
@ -7,5 +8,3 @@ EOF
grep -q "Green Obsidian" /var/tmp/cattest grep -q "Green Obsidian" /var/tmp/cattest
r_checkExitStatus $? r_checkExitStatus $?
/bin/rm /var/tmp/cattest

View File

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
r_log "coreutils" "Testing readlink" r_log "coreutils" "Testing readlink"
trap "/bin/rm /var/tmp/listen" EXIT
ln -s /var/tmp/talk /var/tmp/listen ln -s /var/tmp/talk /var/tmp/listen
readlink /var/tmp/listen | grep -q "/var/tmp/talk" readlink /var/tmp/listen | grep -q "/var/tmp/talk"
r_checkExitStatus $? r_checkExitStatus $?
/bin/rm /var/tmp/listen

View File

@ -1,5 +1,6 @@
#!/bin/bash #!/bin/bash
r_log "coreutils" "Test hash sum tools" r_log "coreutils" "Test hash sum tools"
trap '/bin/rm ${HASHFILE}' EXIT
HASHFILE=/var/tmp/obsidian HASHFILE=/var/tmp/obsidian
echo "Green Obsidian is our release name" > ${HASHFILE} echo "Green Obsidian is our release name" > ${HASHFILE}
@ -22,5 +23,3 @@ r_checkExitStatus $?
r_log "coreutils" "Test sha512sum" r_log "coreutils" "Test sha512sum"
/usr/bin/sha512sum ${HASHFILE} | grep -q e50554c29a5cb7bd04279d3c0918e486024c79c4b305a2e360a97d4021dacf56ce0d17fa6e6a0e81ad03d5fb74fbe2d50cce6081c2c277f22b958cdae978a2f5 /usr/bin/sha512sum ${HASHFILE} | grep -q e50554c29a5cb7bd04279d3c0918e486024c79c4b305a2e360a97d4021dacf56ce0d17fa6e6a0e81ad03d5fb74fbe2d50cce6081c2c277f22b958cdae978a2f5
r_checkExitStatus $? r_checkExitStatus $?
/bin/rm ${HASHFILE}

View File

@ -1,5 +1,6 @@
#!/bin/bash #!/bin/bash
r_log "coreutils" "Testing touch and ls" r_log "coreutils" "Testing touch and ls"
trap '/bin/rm /tmp/touch-?' EXIT
r_log "coreutils" "Touch files with specific dates" r_log "coreutils" "Touch files with specific dates"
touch -t 199104230420 /tmp/touch-1 touch -t 199104230420 /tmp/touch-1
@ -10,5 +11,3 @@ r_log "coreutils" "Verify that the oldest file is last"
ls -lt /tmp/touch-? | tail -n 1 | grep -q 'touch-1' ls -lt /tmp/touch-? | tail -n 1 | grep -q 'touch-1'
r_checkExitStatus $? r_checkExitStatus $?
/bin/rm /tmp/touch-?

View File

@ -1,5 +1,6 @@
#!/bin/bash #!/bin/bash
r_log "coreutils" "Ensure uniq works as expected" r_log "coreutils" "Ensure uniq works as expected"
trap '/bin/rm /var/tmp/uniq' EXIT
cat > /var/tmp/uniq <<EOF cat > /var/tmp/uniq <<EOF
Rocky Rocky
@ -14,4 +15,3 @@ EOF
uniq -d /var/tmp/uniq | wc -l | grep -q 2 && uniq -u /var/tmp/uniq | wc -l | grep -q 4 uniq -d /var/tmp/uniq | wc -l | grep -q 2 && uniq -u /var/tmp/uniq | wc -l | grep -q 4
r_checkExitStatus $? r_checkExitStatus $?
/bin/rm /var/tmp/uniq

View File

@ -2,6 +2,7 @@
r_log "coreutils" "Ensure wc works as expected" r_log "coreutils" "Ensure wc works as expected"
r_log "coreutils" "This should have already been done with uniq" r_log "coreutils" "This should have already been done with uniq"
# Context: we should probably test some switches... # Context: we should probably test some switches...
trap "/bin/rm /var/tmp/wc" EXIT
cat > /var/tmp/wc <<EOF cat > /var/tmp/wc <<EOF
Rocky Rocky
@ -21,5 +22,3 @@ wc -L /var/tmp/wc | grep -q 8 && \
wc -w /var/tmp/wc | grep -q 8 wc -w /var/tmp/wc | grep -q 8
r_checkExitStatus $? r_checkExitStatus $?
/bin/rm /var/tmp/wc

View File

@ -5,6 +5,8 @@ OUTTER=/var/tmp/cpio/out
INNER=/var/tmp/cpio/in INNER=/var/tmp/cpio/in
PASSER=/var/tmp/cpio/pass PASSER=/var/tmp/cpio/pass
trap '/bin/rm -rf /var/tmp/cpio' EXIT
# Nothing should be here. Clean up first. # Nothing should be here. Clean up first.
[ -d /var/tmp/cpio ] && /bin/rm -rf /var/tmp/cpio [ -d /var/tmp/cpio ] && /bin/rm -rf /var/tmp/cpio

View File

@ -15,3 +15,4 @@ r_checkExitStatus $?
r_log "cracklib" "Testing a complicated password" r_log "cracklib" "Testing a complicated password"
echo -e "2948_Obaym-" | cracklib-check | grep -q "OK" echo -e "2948_Obaym-" | cracklib-check | grep -q "OK"
r_checkExitStatus $?

View File

@ -1,6 +1,8 @@
#!/bin/bash #!/bin/bash
r_log "cron" "Testing hourly cron jobs" r_log "cron" "Testing hourly cron jobs"
trap '/bin/rm /etc/cron.{weekly,daily,hourly}/rocky.sh' EXIT
cat > /etc/cron.hourly/rocky.sh <<EOF cat > /etc/cron.hourly/rocky.sh <<EOF
#!/bin/bash #!/bin/bash
echo "obsidian" echo "obsidian"
@ -34,5 +36,3 @@ chmod +x /etc/cron.weekly/rocky.sh
run-parts /etc/cron.weekly | grep -q "obsidian" run-parts /etc/cron.weekly | grep -q "obsidian"
r_checkExitStatus $? r_checkExitStatus $?
/bin/rm /etc/cron.{weekly,daily,hourly}/rocky.sh

View File

@ -1,9 +1,8 @@
#!/bin/bash #!/bin/bash
r_log "file" "Check that we can see a symlink" r_log "file" "Check that we can see a symlink"
FILE_PATH=/var/tmp/linktest FILE_PATH=/var/tmp/linktest
trap '/bin/rm ${FILE_PATH}' EXIT
MIME="inode/symlink" MIME="inode/symlink"
ln -s /etc/issue $FILE_PATH ln -s /etc/issue $FILE_PATH
file -i $FILE_PATH | grep -q "${MIME}" file -i $FILE_PATH | grep -q "${MIME}"
r_checkExitStatus $? r_checkExitStatus $?
/bin/rm /var/tmp/linktest

View File

@ -2,6 +2,7 @@
r_log "findutils" "Testing basic find stuff" r_log "findutils" "Testing basic find stuff"
TMPDIR=/var/tmp/find TMPDIR=/var/tmp/find
trap '/bin/rm -rf $TMPDIR' EXIT
[ -e $TMPDIR ] && rm -rf "$TMPDIR" [ -e $TMPDIR ] && rm -rf "$TMPDIR"
@ -37,8 +38,4 @@ r_log "findutils" "Perform for xargs test: fails with spaces in the name"
# shellcheck disable=SC2038 # shellcheck disable=SC2038
find "$TMPDIR" -type f | xargs ls &> /dev/null && { r_log "findutils" "Why did this get a 0 exit?"; exit "$FAIL"; } find "$TMPDIR" -type f | xargs ls &> /dev/null && { r_log "findutils" "Why did this get a 0 exit?"; exit "$FAIL"; }
ret_val=$? ret_val=$?
if [ "$ret_val" -ne 0 ]; then r_checkExitStatus $ret_val
r_checkExitStatus $?
fi
rm -rf "$TMPDIR"