xgiovio/dvdisaster
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

New upstream version 0.79.6

Browse Source
This commit is contained in:
Carlos Maddela
2017-12-21 05:31:58 +11:00
parent 9ad5d25d65
commit ccc2d79dd4
592 changed files with 18076 additions and 7311 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
regtest/common.bash
View File

@@ -105,10 +105,21 @@ function try()
else
cont_at="false"
fi
doit=$(echo $doit | cut -d\ -f 2)
if test $doall = "yes" || test $doit = "yes"; then
# Clean up temporary files
if test -n "$TMPISO" && test -f "$TMPISO"; then
rm -f $TMPISO
fi
if test -n "$TMPECC" && test -f "$TMPECC"; then
rm -f $TMPECC
fi
if test -n "$SIMISO" && test -f "$SIMISO"; then
rm -f $SIMISO
fi
echo -n "Test case: $1 - "
return 0
else
@@ -153,6 +164,9 @@ function run_regtest()
local spawn_log_window=$(grep "SPAWN_LOG_WINDOW" $CONFIGFILE)
spawn_log_window=$(echo $spawn_log_window | cut -d\ -f 2)
local interactive_diff=$(grep "INTERACTIVE_DIFF" $CONFIGFILE)
interactive_diff=$(echo $interactive_diff | cut -d\ -f 2)
if test -n "${testecc}"; then
testeccopt="-e ${testecc}"
fi
@@ -162,8 +176,8 @@ function run_regtest()
if test "$gui_mode" == "false"; then
rm -f $NEWLOG
echo "LANG=en_EN.UTF-8 $NEWVER -i${testiso} ${testeccopt} ${extra_args} ${testparms}" >>$LOGFILE
LANG=en_EN.UTF-8 $NEWVER -i${testiso} ${testeccopt} ${extra_args} ${testparms} 2>&1 | tail -n +3 >>$NEWLOG
echo "LANG=en_EN.UTF-8 $NEWVER --regtest --no-progress -i${testiso} ${testeccopt} ${extra_args} ${testparms}" >>$LOGFILE
LANG=en_EN.UTF-8 $NEWVER --regtest --no-progress -i${testiso} ${testeccopt} ${extra_args} ${testparms} 2>&1 | tail -n +3 >>$NEWLOG
if ! test -r $REFLOG; then
echo -e "FAIL\n$REFLOG missing in log file database"
@@ -183,10 +197,24 @@ function run_regtest()
mv $TMPLOG $NEWLOG
fi
if ! diff <(tail -n +3 $REFLOG) <(sed -e "s/${SED_REMOVE_ISO_DIR}//g" $NEWLOG | sed -e "s/${SED_REMOVE_DEV_SHM}//g") >${DIFFLOG}; then
echo "BAD; diffs found:"
if ! diff <(tail -n +3 $REFLOG) <(sed -e "s/${SED_REMOVE_ISO_DIR}//g" $NEWLOG) >${DIFFLOG}; then
echo "BAD; diffs found (<expected; >created):"
cat ${DIFFLOG}
pass="false"
if test "$interactive_diff" == "yes"; then
echo
read -n 1 -p ">> Press 'a' to accept this diff; any other key to fail this test:" -e answer
if test "$answer" == "a"; then
cp $REFLOG $LOGDIR
head -n 2 $LOGDIR/${CODEC_PREFIX}_${testsymbol} >$REFLOG
sed -e "s/${SED_REMOVE_ISO_DIR}//g" $NEWLOG >>$REFLOG
pass="skip"
else
pass="false"
fi
else
pass="false"
fi
fi
else # gui mode
replace_config last-image "$testiso"
@@ -195,12 +223,12 @@ function run_regtest()
fi
if test "$spawn_log_window" == "yes"; then
echo LANG=en_EN.UTF-8 $NEWVER $extra_args --resource-file $LOGDIR/.dvdisaster-regtest >$NEWLOG
echo LANG=en_EN.UTF-8 $NEWVER --regtest $extra_args --resource-file $LOGDIR/.dvdisaster-regtest >$NEWLOG
xterm -geometry +0+0 -e tail -n 50 -f $NEWLOG &
xterm_pid=$!
fi
LANG=en_EN.UTF-8 $NEWVER $extra_args --resource-file $LOGDIR/.dvdisaster-regtest >>$NEWLOG 2>&1
LANG=en_EN.UTF-8 $NEWVER --regtest $extra_args --resource-file $LOGDIR/.dvdisaster-regtest >>$NEWLOG 2>&1
rm -f $LOGDIR/.dvdisaster-regtest
fi
@@ -228,10 +256,16 @@ function run_regtest()
pass="false"
fi
fi
if test ${pass} == "true"; then
case "${pass}" in
true)
echo "GOOD"
else
;;
skip)
;;
*)
echo "test symbol for config: $testsymbol"
if test "$fail_on_bad" == "yes"; then
next=$(grep -A 1 ${CODEC_PREFIX}_$testsymbol config.txt | tail -n 1 | cut -d\ -f 1)
@@ -245,7 +279,8 @@ function run_regtest()
fi
exit 1
fi
fi
;;
esac
if test "$gui_mode" == "true" && test "$spawn_log_window" == "yes"; then
read -n 1 -p "Press q to quit; any other key to continue." -e answer