mirror of
https://github.com/zardus/ctf-tools
synced 2025-03-17 23:26:58 +00:00
fix EXPECTFAIL
This commit is contained in:
parent
9995819f84
commit
292be51073
1 changed files with 21 additions and 2 deletions
|
@ -2,6 +2,25 @@
|
|||
|
||||
export EXPECTFAIL=${EXPECTFAIL:-0}
|
||||
|
||||
function flipstatus() {
|
||||
if [ $EXPECTFAIL -eq 0 ];
|
||||
then
|
||||
echo $1
|
||||
else
|
||||
case $1 in
|
||||
FAILED)
|
||||
echo SUCCEEDED
|
||||
;;
|
||||
SUCCEEDED)
|
||||
echo FAILED
|
||||
;;
|
||||
*)
|
||||
echo $1
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
}
|
||||
|
||||
starttime=$SECONDS
|
||||
failed=""
|
||||
for t in $TOOL;
|
||||
|
@ -12,9 +31,9 @@ do
|
|||
if ! docker run -e EXPECTFAIL="$EXPECTFAIL" -e TOOL="$t" --rm ctftools bash -ic 'manage-tools -s -f -v test $TOOL';
|
||||
then
|
||||
failed="$failed$t "
|
||||
echo "[ACCOUNTING]=====[ $DISTRO $t FAILED $((SECONDS - toolstarttime)) ]"
|
||||
echo "[ACCOUNTING]=====[ $DISTRO $t $(flipstatus FAILED) $((SECONDS - toolstarttime)) ]"
|
||||
else
|
||||
echo "[ACCOUNTING]=====[ $DISTRO $t SUCCEEDED $((SECONDS - toolstarttime)) ]"
|
||||
echo "[ACCOUNTING]=====[ $DISTRO $t $(flipstatus SUCCEEDED) $((SECONDS - toolstarttime)) ]"
|
||||
fi
|
||||
echo "[-] TOOL $t TEST ENDED: $((SECONDS - toolstarttime)) seconds, $((SECONDS - starttime)) seconds since start of script."
|
||||
set -e
|
||||
|
|
Loading…
Add table
Reference in a new issue