sync from upstream up to 22:14a375563e2b

This includes the following commits:

changeset:   22:14a375563e2b
summary:     chang "while" command to "type -P" in bash based configure

changeset:   21:c4bf7c0f33d2
summary:     updated codec paper for RS01 life cycle

changeset:   20:dbcaad8128aa
summary:     replaced build count with mercurial changeset

changeset:   19:fba258a6acfa
summary:     Added tag 0.79.10 for changeset 49950be5a2ef

changeset:   18:49950be5a2ef
summary:     merged some debian patches

changeset:   17:815be3929c41
summary:     merged "easy" patches from Stéphane Lesimple's version

changeset:   16:7d15f8a958cb
summary:     Made printf format strings 32/64bit safe as suggested by Stéphane;

changeset:   15:1055a53b8d6d
summary:     reorganized code for --with-gui=[yes|no] option

changeset:   14:fbe2ae12a32c
summary:     Added tag 0.79.9 for changeset f2fdd6d3a1f5

changeset:   13:f2fdd6d3a1f5
summary:     updated TODO and CHANGELOG

And other changes that were needed to resolve the (many) conflicts.

regtest/common.bash

@@ -7,6 +7,8 @@ DATABASE=./database
 RNDSEQ="./fixed-random-sequence"
 
 NON_EXISTENT_DEVICE=/dev/sdz
+
+# directory for permanently storing test files
 ISODIR=/var/tmp/regtest
 if ! test -d $ISODIR; then
     echo "$ISODIR does not exist."
@@ -14,6 +16,14 @@ if ! test -d $ISODIR; then
     exit 1
 fi
 
+# directory for temporary files; e.g. to keep them away from SSDs
+TMPDIR=/dev/shm
+if ! test -d $TMPDIR; then
+    echo "$TMPDIR does not exist."
+    echo "Please create it manually, or edit common.bash"
+    exit 0
+fi
+
 LOGDIR="/dev/shm"
 if ! test -d $LOGDIR; then
     LOGDIR=/tmp
@@ -201,6 +211,11 @@ function run_regtest()
 
    local interactive_diff=$(grep "INTERACTIVE_DIFF" $CONFIGFILE)
    interactive_diff=$(echo $interactive_diff | cut -d\  -f 2) 
+
+   if test -z "$testecc"; then
+       echo -e "broken test case $1\n--> run_regtest: 4 arguments required to ensure deterministic test behaviour."
+       exit 1
+   fi
    
    if test -n "${testecc}"; then
        testeccopt="-e ${testecc}"
@@ -209,7 +224,6 @@ 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 
@@ -238,14 +252,19 @@ function run_regtest()
 
          filter=cat
          echo "$options" | grep -qw SORTED && filter=sort
-         if [ "${CODEC_PREFIX}_${testsymbol}" = RS01_scan_no_device ] || \
-            [ "${CODEC_PREFIX}_${testsymbol}" = RS01_read_no_device ] || \
-            [ "${CODEC_PREFIX}_${testsymbol}" = RS01_adaptive_no_device ]; then
-            # for Windows
+
+         # for Windows
+         if [[ $testsymbol =~ _no_device$ ]]; then
             sed -i -re "s=device $NON_EXISTENT_DEVICE\.=/dev/sdz: No such file or directory=" $NEWLOG
          fi
 
-         if ! diff <(tail -n +3 $REFLOG | $filter) <(sed -re "s=[a-zA-Z:/]+/([a-z0-9_-]+\.(ecc|iso))=\1=g;s=$ISODIR/==g" $NEWLOG | $filter) >${DIFFLOG}; then
+         # for Windows, just remove any path we find:
+         sed -i -re "s=[A-Z]:/[A-Za-z0-9_/-]+/==g" $NEWLOG
+
+         # remove all paths to get reproducible output:
+         sed -i -re "s=$TMPDIR/*==g;s=$ISODIR/*==g" $NEWLOG
+
+         if ! diff <(tail -n +3 $REFLOG | $filter) <(cat $NEWLOG | $filter) >${DIFFLOG}; then
             if [ "$REGTEST_NO_UTF8" = 1 ]; then
                echo "BAD; diffs found (<expected; >created):"
             else
@@ -259,7 +278,7 @@ function run_regtest()
                   if test "$answer" == "a"; then
                      cp $REFLOG $LOGDIR
                      head -n 2 $LOGDIR/${CODEC_PREFIX}_${testsymbol} >$REFLOG 
-                     sed -re "s=[a-zA-Z:/]+/([a-z0-9_-]+\.(ecc|iso))=\1=g;s=$ISODIR/==g" $NEWLOG >>$REFLOG
+                     cat $NEWLOG >>$REFLOG
                      pass="skip"
                   elif test "$answer" == "v"; then
                      vimdiff $REFLOG $NEWLOG