mirrors/sby
3
0
Fork 0
mirror of https://github.com/YosysHQ/sby.git synced 2025-08-08 06:11:24 +00:00
Code Activity

Don't use -f for intertask tests...

Browse source 
... if we expect the database to still contain previous runs.
Use `rm -rf` to clear directories by hand instead.
This commit is contained in:
Krystine Sherwin 2025-07-09 10:40:49 +12:00
parent a6496d646f
commit 7c5c96f5ca
No known key found for this signature in database
2 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

16
tests/intertask/cancelledby.sh
View file

@ -3,21 +3,21 @@ set -e
if [[ $TASK == a ]]; then if [[ $TASK == a ]]; then
# different process, no cancellations # different process, no cancellations
python3 $SBY_MAIN --prefix $WORKDIR -f $SBY_FILE a rm -rf ${WORKDIR}_*
python3 $SBY_MAIN --prefix $WORKDIR -f $SBY_FILE b python3 $SBY_MAIN --prefix $WORKDIR $SBY_FILE a
python3 $SBY_MAIN --prefix $WORKDIR -f $SBY_FILE c python3 $SBY_MAIN --prefix $WORKDIR $SBY_FILE b
python3 $SBY_MAIN --prefix $WORKDIR $SBY_FILE c
test -e ${WORKDIR}_a/PASS -a -e ${WORKDIR}_b/FAIL -a -e ${WORKDIR}_c/FAIL test -e ${WORKDIR}_a/PASS -a -e ${WORKDIR}_b/FAIL -a -e ${WORKDIR}_c/FAIL
elif [[ $TASK == b ]]; then elif [[ $TASK == b ]]; then
# same process, a cancels c cancels b # same process, a cancels c cancels b
# use statusdb so that the different taskloops from using --sequential doesn't matter # use statusdb so that the different taskloops from using --sequential doesn't matter
python3 $SBY_MAIN --prefix $WORKDIR -f $SBY_FILE --statusreset || true
python3 $SBY_MAIN --prefix $WORKDIR -f $SBY_FILE a c b --sequential --statuscancels python3 $SBY_MAIN --prefix $WORKDIR -f $SBY_FILE a c b --sequential --statuscancels
test -e ${WORKDIR}_a/PASS -a -e ${WORKDIR}_b/CANCELLED -a -e ${WORKDIR}_c/CANCELLED test -e ${WORKDIR}_a/PASS -a -e ${WORKDIR}_b/CANCELLED -a -e ${WORKDIR}_c/CANCELLED
else else
# different process, b cancels a, c completes before a # different process, b cancels a, c completes before a
python3 $SBY_MAIN --prefix $WORKDIR -f $SBY_FILE --statusreset || true rm -rf ${WORKDIR} ${WORKDIR}_*
python3 $SBY_MAIN --prefix $WORKDIR -f $SBY_FILE b --statuscancels python3 $SBY_MAIN --prefix $WORKDIR $SBY_FILE b --statuscancels
python3 $SBY_MAIN --prefix $WORKDIR -f $SBY_FILE c --statuscancels python3 $SBY_MAIN --prefix $WORKDIR $SBY_FILE c --statuscancels
python3 $SBY_MAIN --prefix $WORKDIR -f $SBY_FILE a --statuscancels python3 $SBY_MAIN --prefix $WORKDIR $SBY_FILE a --statuscancels
echo test -e ${WORKDIR}_a/CANCELLED -a -e ${WORKDIR}_b/FAIL -a -e ${WORKDIR}_c/FAIL echo test -e ${WORKDIR}_a/CANCELLED -a -e ${WORKDIR}_b/FAIL -a -e ${WORKDIR}_c/FAIL
fi fi

6
tests/intertask/longrunning.sh
View file

@ -4,11 +4,11 @@ set -e
if [[ $TASK == bmc ]]; then if [[ $TASK == bmc ]]; then
python3 $SBY_MAIN --prefix $WORKDIR -f $SBY_FILE prove bmc python3 $SBY_MAIN --prefix $WORKDIR -f $SBY_FILE prove bmc
else else
python3 $SBY_MAIN --prefix $WORKDIR -f $SBY_FILE --statusreset || true rm -rf ${WORKDIR} ${WORKDIR}_*
python3 $SBY_MAIN --prefix $WORKDIR -f $SBY_FILE bmc --statuscancels & bmc_pid="$!" python3 $SBY_MAIN --prefix $WORKDIR $SBY_FILE bmc --statuscancels & bmc_pid="$!"
# make sure we don't leave the background task running # make sure we don't leave the background task running
trap 'kill "$bmc_pid" 2>/dev/null || true' EXIT trap 'kill "$bmc_pid" 2>/dev/null || true' EXIT
python3 $SBY_MAIN --prefix $WORKDIR -f $SBY_FILE prove python3 $SBY_MAIN --prefix $WORKDIR $SBY_FILE prove
sleep 10 sleep 10
test -e ${WORKDIR}_bmc/CANCELLED test -e ${WORKDIR}_bmc/CANCELLED
fi fi