upstream: 2:3d07b022a7df [aggregated changes for version 0.79.8]

2021-05-12 10:19:08 +02:00
parent eac7884373
commit 90b5ab6443
107 changed files with 300 additions and 684 deletions
--- a/regtest/common.bash
+++ b/regtest/common.bash
@@ -209,10 +209,11 @@ function run_regtest()
   REFLOG=${DATABASE}/${CODEC_PREFIX}_${testsymbol}

   if test "$gui_mode" == "false"; then
+<<<<<<< HEAD
      rm -f $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 
+      LANG=en_EN.UTF-8 $NEWVER --regtest --no-progress -i${testiso} ${testeccopt} ${extra_args} ${testparms} 2>&1 | tail -n +4  >>$NEWLOG 

      if ! test -r $REFLOG; then
          pass="false"
@@ -254,7 +255,7 @@ function run_regtest()

            if test "$interactive_diff" == "yes"; then
               while true; do
-                  read -n 1 -p ">> Press 'a' to accept this diff; 'v' to vimdiff; any other key to fail this test:" -e answer
+                  read -n 1 -p ">> Press 'a' to accept this diff; 'i' to ignore; 'v' to vimdiff; 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 
@@ -262,8 +263,13 @@ function run_regtest()
                     pass="skip"
                  elif test "$answer" == "v"; then
                     vimdiff $REFLOG $NEWLOG
-
                     continue
+                  else
+		     if test "$answer" == "i"; then
+			   pass="skip"
+		     else
+			   pass="false"
+		     fi
                  fi
                  break
               done
--- a/regtest/database/RS01_read_no_device
+++ b/regtest/database/RS01_read_no_device
@@ -1,5 +1,11 @@
 ignore
 ignore
+This software comes with  ABSOLUTELY NO WARRANTY.  This
+is free software and you are welcome to redistribute it
+under the conditions of the GNU GENERAL PUBLIC LICENSE.
+See the file "COPYING" for further information.
+
+*
 * dvdisaster - can not continue:
 *
 Could not open /dev/sdz: No such file or directory
--- a/regtest/database/RS01_read_no_device_access
+++ b/regtest/database/RS01_read_no_device_access
@@ -1,5 +1,11 @@
 ignore
 ignore
+This software comes with  ABSOLUTELY NO WARRANTY.  This
+is free software and you are welcome to redistribute it
+under the conditions of the GNU GENERAL PUBLIC LICENSE.
+See the file "COPYING" for further information.
+
+*
 * dvdisaster - can not continue:
 *
 Could not open sdz: Permission denied
--- a/regtest/database/RS01_read_with_incompatible_ecc
+++ b/regtest/database/RS01_read_with_incompatible_ecc
@@ -12,7 +12,7 @@ Medium "Random Image": CD-R mode 1, 21000 sectors, created 16-07-2006.
 * Warning: This ecc file requires dvdisaster-99.99!
 *          Proceeding could trigger incorrect behaviour.
 *          Please read the image without using this ecc file
-*          or visit http://www.dvdisaster.org for an upgrade.
+*          or upgrade dvdisaster.

 Creating new rs01-tmp.iso image.
 Reading CRC information from ecc data (RS01) ... done.
--- a/regtest/database/RS01_scan_no_device
+++ b/regtest/database/RS01_scan_no_device
@@ -1,5 +1,11 @@
 ignore
 ignore
+This software comes with  ABSOLUTELY NO WARRANTY.  This
+is free software and you are welcome to redistribute it
+under the conditions of the GNU GENERAL PUBLIC LICENSE.
+See the file "COPYING" for further information.
+
+*
 * dvdisaster - can not continue:
 *
 Could not open /dev/sdz: No such file or directory
--- a/regtest/database/RS01_scan_no_device_access
+++ b/regtest/database/RS01_scan_no_device_access
@@ -1,5 +1,11 @@
 ignore
 ignore
+This software comes with  ABSOLUTELY NO WARRANTY.  This
+is free software and you are welcome to redistribute it
+under the conditions of the GNU GENERAL PUBLIC LICENSE.
+See the file "COPYING" for further information.
+
+*
 * dvdisaster - can not continue:
 *
 Could not open sdz: Permission denied
--- a/regtest/database/RS01_scan_with_incompatible_ecc
+++ b/regtest/database/RS01_scan_with_incompatible_ecc
@@ -12,7 +12,7 @@ Medium "Random Image": CD-R mode 1, 21000 sectors, created 16-07-2006.
 * Warning: This ecc file requires dvdisaster-99.99!
 *          Proceeding could trigger incorrect behaviour.
 *          Please read the image without using this ecc file
-*          or visit http://www.dvdisaster.org for an upgrade.
+*          or upgrade dvdisaster.

 Scanning medium for read errors.
 Reading CRC information from ecc data (RS01) ... done.
--- a/regtest/database/RS02_read_incompatible_ecc
+++ b/regtest/database/RS02_read_incompatible_ecc
@@ -11,7 +11,7 @@ Medium "Random Image": CD-R mode 1, 34932 sectors, Ecc, created 16-07-2006.

 * Warning: This image requires dvdisaster-99.99!
 *          Proceeding could trigger incorrect behaviour.
-*          Please visit http://www.dvdisaster.org for an upgrade.
+*          Please upgrade dvdisaster.

 Creating new rs02-tmp.iso image.
 Reading CRC information from ecc data (RS02) ... done.
--- a/regtest/database/RS02_scan_incompatible_ecc
+++ b/regtest/database/RS02_scan_incompatible_ecc
@@ -11,7 +11,7 @@ Medium "Random Image": CD-R mode 1, 34932 sectors, Ecc, created 16-07-2006.

 * Warning: This image requires dvdisaster-99.99!
 *          Proceeding could trigger incorrect behaviour.
-*          Please visit http://www.dvdisaster.org for an upgrade.
+*          Please upgrade dvdisaster.

 Scanning medium for read errors.
 Reading CRC information from ecc data (RS02) ... done.
--- a/regtest/database/RS03f_read_incompatible_ecc
+++ b/regtest/database/RS03f_read_incompatible_ecc
@@ -12,7 +12,7 @@ Medium "Random Image": CD-R mode 1, 21000 sectors, created 16-07-2006.
 * Warning: This ecc file requires dvdisaster-99.99!
 *          Proceeding could trigger incorrect behaviour.
 *          Please read the image without using this ecc file
-*          or visit http://www.dvdisaster.org for an upgrade.
+*          or upgrade dvdisaster.

 Creating new rs03f-tmp.iso image.
 Reading CRC information from ecc data (RS03) ... done.
--- a/regtest/database/RS03f_scan_incompatible_ecc
+++ b/regtest/database/RS03f_scan_incompatible_ecc
@@ -12,7 +12,7 @@ Medium "Random Image": CD-R mode 1, 21000 sectors, created 16-07-2006.
 * Warning: This ecc file requires dvdisaster-99.99!
 *          Proceeding could trigger incorrect behaviour.
 *          Please read the image without using this ecc file
-*          or visit http://www.dvdisaster.org for an upgrade.
+*          or upgrade dvdisaster.

 Scanning medium for read errors.
 Reading CRC information from ecc data (RS03) ... done.
--- a/regtest/database/RS03i_read_incompatible_ecc
+++ b/regtest/database/RS03i_read_incompatible_ecc
@@ -11,7 +11,7 @@ Medium "Random Image": CD-R mode 1, 24990 sectors, Ecc, created 16-07-2006.

 * Warning: This image requires dvdisaster-99.99!
 *          Proceeding could trigger incorrect behaviour.
-*          Please visit http://www.dvdisaster.org for an upgrade.
+*          Please upgrade dvdisaster.

 Creating new rs03i-tmp.iso image.
 Reading CRC information from ecc data (RS03) ... done.
--- a/regtest/database/RS03i_scan_incompatible_ecc
+++ b/regtest/database/RS03i_scan_incompatible_ecc
@@ -11,7 +11,7 @@ Medium "Random Image": CD-R mode 1, 24990 sectors, Ecc, created 16-07-2006.

 * Warning: This image requires dvdisaster-99.99!
 *          Proceeding could trigger incorrect behaviour.
-*          Please visit http://www.dvdisaster.org for an upgrade.
+*          Please upgrade dvdisaster.

 Scanning medium for read errors.
 Reading CRC information from ecc data (RS03) ... done.