chore: re-enable adaptive read tests, enhance github actions

.github/workflows/make-dist.sh

@@ -0,0 +1,62 @@
+#!/bin/bash
+set -e
+set -x
+
+github_ref="$1"
+
+if [ -n "$GITHUB_EVENT_PATH" ] && [ -f "$GITHUB_EVENT_PATH" ]; then
+    if command -v jq >/dev/null; then
+        upload_url=$(jq -r '.release.upload_url' < $GITHUB_EVENT_PATH)
+        echo "Upload URL is $upload_url"
+        echo "::set-output name=upload_url::$upload_url"
+    fi
+else
+    echo "This should only be run from GitHub Actions"
+    exit 1
+fi
+
+case "$MSYSTEM" in
+    MINGW64) os=win64; exe=.exe;;
+    MINGW32) os=win32; exe=.exe;;
+    *)       os=linux64; exe='';;
+esac
+
+./dvdisaster$exe --version
+
+if ./dvdisaster$exe --version | grep -q NOGUI; then
+    GUI=0
+    suffix="$os-cli-only"
+else
+    GUI=1
+    suffix=$os-static
+fi
+
+archive=dvdisaster-$(echo "$github_ref" | grep -Eo '[^/]+$')-$suffix.zip
+echo "Archive name is $archive"
+echo "::set-output name=archive::$archive"
+
+mkdir -p dist/locale
+cp -vr locale/*/ dist/locale/
+if [ "$os" != "linux64" ]; then
+  if [ "$GUI" = 1 ]; then
+    mkdir -p dist/share/themes
+    cp -vr $MINGW_PREFIX/share/themes/MS-Windows dist/share/themes/
+    cp -vr $MINGW_PREFIX/lib/gtk-2.0 dist/lib/
+    rm -rf dist/lib/gtk-2.0/include
+  fi
+  mkdir -p dist/lib
+  ntldd -R dvdisaster
+  for i in $(ntldd -R dvdisaster | awk '/mingw/ {print $3}' | tr \\\\ / | grep -Eo '[^/]+$')
+  do
+    test -e $MINGW_PREFIX/bin/$i && cp -va $MINGW_PREFIX/bin/$i dist/
+  done
+  find dist -type f -name "*.a" -delete
+fi
+man -t documentation/dvdisaster.en.1 | ps2pdf - dist/dvdisaster.pdf
+cp dvdisaster documentation/dvdisaster.*.1 documentation/user-manual/manual.pdf dist/
+if command -v zip >/dev/null; then
+    mv dist ${archive/.zip/}
+    zip -9r $archive ${archive/.zip/}
+    mv ${archive/.zip/} dist
+fi
+echo "dist done ($archive)"

.github/workflows/release.yml

@@ -5,57 +5,9 @@ on:
     types: [published]
 
 jobs:
-  linux64-cli:
-    name: Linux64 CLI static
-    runs-on: ubuntu-latest
-    steps:
-    - name: Checkout code
-      uses: actions/checkout@v2
-
-    - name: install prerequisites
-      run: sudo apt update && sudo apt install -y libglib2.0-dev ghostscript man jq
-
-    - name: configure
-      run: CLI_ONLY=1 ./configure
-
-    - name: make
-      run: nproc && make -j$(nproc) && make static && mv -f dvdisaster-static dvdisaster
-
-    - name: check executable
-      run: |
-        ./dvdisaster --version && ./dvdisaster --version | grep -q dirty || true
-        file dvdisaster && file dvdisaster | grep -q 'ELF 64' && file dvdisaster | grep -q 'statically linked'
-
-    - name: build dist
-      id: dist
-      run: |
-        archive=dvdisaster-$(echo "${{ github.ref }}" | grep -Eo '[^/]+$')-linux64-static-cli-only.zip
-        upload_url=$(jq -r '.release.upload_url' < $GITHUB_EVENT_PATH)
-        echo "Archive name is $archive"
-        echo "Upload URL is $upload_url"
-        echo "::set-output name=archive::$archive"
-        echo "::set-output name=upload_url::$upload_url"
-        mkdir dist
-        man -t documentation/dvdisaster.en.1 | ps2pdf - dist/dvdisaster.pdf
-        mv dvdisaster documentation/dvdisaster.*.1 documentation/user-manual/manual.pdf dist/
-        mv dist ${archive/.zip/}
-        zip -9r $archive ${archive/.zip/}
-
-    - name: Upload Release Asset
-      id: upload-release-asset
-      uses: actions/upload-release-asset@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ steps.dist.outputs.upload_url }}
-        asset_path: ./${{ steps.dist.outputs.archive }}
-        asset_name: ${{ steps.dist.outputs.archive }}
-        asset_content_type: application/zip
 
   win64-gui:
-    name: Windows64 GUI
     runs-on: windows-2016
-
     defaults:
       run:
         shell: msys2 {0}
@@ -65,49 +17,27 @@ jobs:
         msystem: MINGW64
         update: false
         install: git diffutils make pkg-config mingw-w64-x86_64-gtk2 mingw-w64-x86_64-glib2 mingw-w64-x86_64-gcc mingw-w64-x86_64-ghostscript mingw-w64-x86_64-jq mingw-w64-x86_64-ntldd-git man zip
-
     - run: git config --global core.autocrlf input
       shell: bash
-
     - uses: actions/checkout@v2
-
     - name: configure
       run: ./configure
-
     - name: make
       run: nproc && make -j$(nproc)
-
     - name: check executable
       run: |
-        ./dvdisaster.exe --version && ./dvdisaster --version | grep -q dirty || true
+          ./dvdisaster.exe --version
-        file dvdisaster.exe && file dvdisaster.exe | grep -q 'x86-64, for MS Windows'
+          file dvdisaster.exe
-
+          ./dvdisaster.exe --version | grep -q -e dirty -e NOGUI && exit 1
-    - name: build dist
+          file dvdisaster.exe | grep -q 'x86-64, for MS Windows'
+    - name: prepare dist
+      run: ./.github/workflows/make-dist.sh ${{ github.ref }}
       id: dist
+    - name: check executability of dist from cmd.exe
+      shell: cmd
       run: |
-          archive=dvdisaster-$(echo "${{ github.ref }}" | grep -Eo '[^/]+$')-win64.zip
+          cd dist
-          upload_url=$(jq -r '.release.upload_url' < $GITHUB_EVENT_PATH)
+          dvdisaster.exe --version
-          echo "Archive name is $archive"
-          echo "Upload URL is $upload_url"
-          echo "::set-output name=archive::$archive"
-          echo "::set-output name=upload_url::$upload_url"
-          mkdir dist
-          mkdir -p dist/lib dist/locale dist/share/themes
-          cp -vr locale/*/ dist/locale/
-          cp -vr $MINGW_PREFIX/share/themes/MS-Windows dist/share/themes/
-          cp -vr $MINGW_PREFIX/lib/gtk-2.0 dist/lib/
-          find dist -type f -name "*.a" -delete
-          rm -rf dist/lib/gtk-2.0/include
-          ntldd -R dvdisaster
-          for i in $(ntldd -R dvdisaster | awk '/mingw/ {print $3}' | tr \\\\ / | grep -Eo '[^/]+$')
-          do
-            test -e $MINGW_PREFIX/bin/$i && cp -va $MINGW_PREFIX/bin/$i dist/
-          done
-          man -t documentation/dvdisaster.en.1 | ps2pdf - dist/dvdisaster.pdf
-          mv dvdisaster documentation/dvdisaster.*.1 documentation/user-manual/manual.pdf dist/
-          mv dist ${archive/.zip/}
-          zip -9r $archive ${archive/.zip/}
-
     - name: Upload Release Asset
       id: upload-release-asset
       uses: actions/upload-release-asset@v1
@@ -120,9 +50,7 @@ jobs:
         asset_content_type: application/zip
 
   win32-gui:
-    name: Windows32 GUI
     runs-on: windows-2016
-
     defaults:
       run:
         shell: msys2 {0}
@@ -132,51 +60,27 @@ jobs:
         msystem: MINGW32
         update: false
         install: git diffutils make pkg-config mingw-w64-i686-gtk2 mingw-w64-i686-glib2 mingw-w64-i686-gcc mingw-w64-i686-ghostscript mingw-w64-i686-jq mingw-w64-i686-ntldd-git man zip
-
     - run: git config --global core.autocrlf input
       shell: bash
-
     - uses: actions/checkout@v2
-
     - name: configure
       run: ./configure
-
     - name: make
       run: nproc && make -j$(nproc)
-
     - name: check executable
       run: |
-        ./dvdisaster.exe --version && ./dvdisaster --version | grep -q dirty || true
+          ./dvdisaster.exe --version
-        file dvdisaster.exe && file dvdisaster.exe | grep -q '386, for MS Windows'
+          file dvdisaster.exe
-
+          ./dvdisaster.exe --version | grep -q -e dirty -e NOGUI && exit 1
-    - name: build dist
+          file dvdisaster.exe | grep -q '386, for MS Windows'
+    - name: prepare dist
+      run: ./.github/workflows/make-dist.sh ${{ github.ref }}
       id: dist
+    - name: check executability of dist from cmd.exe
+      shell: cmd
       run: |
-          set -x
+          cd dist
-          set +o pipefail
+          dvdisaster.exe --version
-          archive=dvdisaster-$(echo "${{ github.ref }}" | grep -Eo '[^/]+$')-win32.zip
-          upload_url=$(jq -r '.release.upload_url' < $GITHUB_EVENT_PATH)
-          echo "Archive name is $archive"
-          echo "Upload URL is $upload_url"
-          echo "::set-output name=archive::$archive"
-          echo "::set-output name=upload_url::$upload_url"
-          mkdir dist
-          mkdir -p dist/lib dist/locale dist/share/themes
-          cp -vr locale/*/ dist/locale/
-          cp -vr $MINGW_PREFIX/share/themes/MS-Windows dist/share/themes/
-          cp -vr $MINGW_PREFIX/lib/gtk-2.0 dist/lib/
-          find dist -type f -name "*.a" -delete
-          rm -rf dist/lib/gtk-2.0/include
-          ntldd -R dvdisaster
-          for i in $(ntldd -R dvdisaster | awk '/mingw/ {print $3}' | tr \\\\ / | grep -Eo '[^/]+$')
-          do
-            test -e $MINGW_PREFIX/bin/$i && cp -va $MINGW_PREFIX/bin/$i dist/
-          done
-          man -t documentation/dvdisaster.en.1 | ps2pdf - dist/dvdisaster.pdf
-          mv dvdisaster documentation/dvdisaster.*.1 documentation/user-manual/manual.pdf dist/
-          mv dist ${archive/.zip/}
-          zip -9r $archive ${archive/.zip/}
-
     - name: Upload Release Asset
       id: upload-release-asset
       uses: actions/upload-release-asset@v1
@@ -189,9 +93,7 @@ jobs:
         asset_content_type: application/zip
 
   win64-cli:
-    name: Windows64 CLI
     runs-on: windows-2016
-
     defaults:
       run:
         shell: msys2 {0}
@@ -201,45 +103,28 @@ jobs:
         msystem: MINGW64
         update: false
         install: git diffutils make pkg-config mingw-w64-x86_64-glib2 mingw-w64-x86_64-gcc mingw-w64-x86_64-ghostscript mingw-w64-x86_64-jq mingw-w64-x86_64-ntldd-git man zip
-
     - run: git config --global core.autocrlf input
       shell: bash
-
     - uses: actions/checkout@v2
-
     - name: configure
-      run: CLI_ONLY=1 ./configure
+      run: env CLI_ONLY=1 ./configure
-
     - name: make
       run: nproc && make -j$(nproc)
-
     - name: check executable
       run: |
-        ./dvdisaster.exe --version && ./dvdisaster --version | grep -q dirty || true
+          ./dvdisaster.exe --version
-        file dvdisaster.exe && file dvdisaster.exe | grep -q 'x86-64, for MS Windows'
+          file dvdisaster.exe
-
+          ./dvdisaster.exe --version | grep -q -e dirty && exit 1
-    - name: build dist
+          ./dvdisaster.exe --version | grep -q NOGUI
+          file dvdisaster.exe | grep -q 'x86-64, for MS Windows'
+    - name: prepare dist
+      run: ./.github/workflows/make-dist.sh ${{ github.ref }}
       id: dist
+    - name: check executability of dist from cmd.exe
+      shell: cmd
       run: |
-          archive=dvdisaster-$(echo "${{ github.ref }}" | grep -Eo '[^/]+$')-win64-cli-only.zip
+          cd dist
-          upload_url=$(jq -r '.release.upload_url' < $GITHUB_EVENT_PATH)
+          dvdisaster.exe --version
-          echo "Archive name is $archive"
-          echo "Upload URL is $upload_url"
-          echo "::set-output name=archive::$archive"
-          echo "::set-output name=upload_url::$upload_url"
-          mkdir dist
-          mkdir -p dist/locale
-          cp -vr locale/*/ dist/locale/
-          ntldd -R dvdisaster
-          for i in $(ntldd -R dvdisaster | awk '/mingw/ {print $3}' | tr \\\\ / | grep -Eo '[^/]+$')
-          do
-            test -e $MINGW_PREFIX/bin/$i && cp -va $MINGW_PREFIX/bin/$i dist/
-          done
-          man -t documentation/dvdisaster.en.1 | ps2pdf - dist/dvdisaster.pdf
-          mv dvdisaster documentation/dvdisaster.*.1 documentation/user-manual/manual.pdf dist/
-          mv dist ${archive/.zip/}
-          zip -9r $archive ${archive/.zip/}
-
     - name: Upload Release Asset
       id: upload-release-asset
       uses: actions/upload-release-asset@v1
@@ -252,9 +137,7 @@ jobs:
         asset_content_type: application/zip
 
   win32-cli:
-    name: Windows32 CLI
     runs-on: windows-2016
-
     defaults:
       run:
         shell: msys2 {0}
@@ -264,45 +147,57 @@ jobs:
         msystem: MINGW32
         update: false
         install: git diffutils make pkg-config mingw-w64-i686-glib2 mingw-w64-i686-gcc mingw-w64-i686-ghostscript mingw-w64-i686-jq mingw-w64-i686-ntldd-git man zip
-
     - run: git config --global core.autocrlf input
       shell: bash
-
     - uses: actions/checkout@v2
-
     - name: configure
-      run: CLI_ONLY=1 ./configure
+      run: env CLI_ONLY=1 ./configure
-
     - name: make
       run: nproc && make -j$(nproc)
-
     - name: check executable
       run: |
-        ./dvdisaster.exe --version && ./dvdisaster --version | grep -q dirty || true
+          ./dvdisaster.exe --version
-        file dvdisaster.exe && file dvdisaster.exe | grep -q '386, for MS Windows'
+          file dvdisaster.exe
-
+          ./dvdisaster.exe --version | grep -q -e dirty && exit 1
-    - name: build dist
+          ./dvdisaster.exe --version | grep -q NOGUI
+          file dvdisaster.exe | grep -q '386, for MS Windows'
+    - name: prepare dist
+      run: ./.github/workflows/make-dist.sh ${{ github.ref }}
       id: dist
+    - name: check executability of dist from cmd.exe
+      shell: cmd
       run: |
-          archive=dvdisaster-$(echo "${{ github.ref }}" | grep -Eo '[^/]+$')-win32-cli-only.zip
+          cd dist
-          upload_url=$(jq -r '.release.upload_url' < $GITHUB_EVENT_PATH)
+          dvdisaster.exe --version
-          echo "Archive name is $archive"
+    - name: Upload Release Asset
-          echo "Upload URL is $upload_url"
+      id: upload-release-asset
-          echo "::set-output name=archive::$archive"
+      uses: actions/upload-release-asset@v1
-          echo "::set-output name=upload_url::$upload_url"
+      env:
-          mkdir dist
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          mkdir -p dist/locale
+      with:
-          cp -vr locale/*/ dist/locale/
+        upload_url: ${{ steps.dist.outputs.upload_url }}
-          ntldd -R dvdisaster
+        asset_path: ./${{ steps.dist.outputs.archive }}
-          for i in $(ntldd -R dvdisaster | awk '/mingw/ {print $3}' | tr \\\\ / | grep -Eo '[^/]+$')
+        asset_name: ${{ steps.dist.outputs.archive }}
-          do
+        asset_content_type: application/zip
-            test -e $MINGW_PREFIX/bin/$i && cp -va $MINGW_PREFIX/bin/$i dist/
+
-          done
+  linux64-cli:
-          man -t documentation/dvdisaster.en.1 | ps2pdf - dist/dvdisaster.pdf
+    runs-on: ubuntu-latest
-          mv dvdisaster documentation/dvdisaster.*.1 documentation/user-manual/manual.pdf dist/
+    steps:
-          mv dist ${archive/.zip/}
+    - uses: actions/checkout@v2
-          zip -9r $archive ${archive/.zip/}
+    - name: install prerequisites
-
+      run: sudo apt update && sudo apt install -y libglib2.0-dev ghostscript man jq
+    - name: configure
+      run: env CLI_ONLY=1 ./configure
+    - name: make
+      run: nproc && make -j$(nproc) && make static && mv -f dvdisaster-static dvdisaster
+    - name: check executable
+      run: |
+        ./dvdisaster --version && ./dvdisaster --version | grep -q dirty || true
+        file dvdisaster && file dvdisaster | grep -q 'ELF 64' && file dvdisaster | grep -q 'statically linked'
+
+    - name: build dist
+      run: ./.github/workflows/make-dist.sh ${{ github.ref }}
+      id: dist
     - name: Upload Release Asset
       id: upload-release-asset
       uses: actions/upload-release-asset@v1

.github/workflows/tests.yml

@@ -4,13 +4,174 @@ on: [pull_request]
 
 jobs:
 
+  win64-gui:
+    runs-on: windows-2016
+    defaults:
+      run:
+        shell: msys2 {0}
+    steps:
+    - uses: msys2/setup-msys2@v2
+      with:
+        msystem: MINGW64
+        update: false
+        install: git diffutils make pkg-config mingw-w64-x86_64-gtk2 mingw-w64-x86_64-glib2 mingw-w64-x86_64-gcc mingw-w64-x86_64-ghostscript mingw-w64-x86_64-jq mingw-w64-x86_64-ntldd-git man zip
+    - run: git config --global core.autocrlf input
+      shell: bash
+    - uses: actions/checkout@v2
+    - name: configure
+      run: ./configure
+    - name: make
+      run: nproc && make -j$(nproc)
+    - name: check executable
+      run: |
+          ./dvdisaster.exe --version
+          file dvdisaster.exe
+          ./dvdisaster.exe --version | grep -q -e dirty -e NOGUI && exit 1
+          file dvdisaster.exe | grep -q 'x86-64, for MS Windows'
+    - name: prepare dist
+      run: ./.github/workflows/make-dist.sh ${{ github.ref }}
+      id: dist
+    - name: check executability of dist from cmd.exe
+      shell: cmd
+      run: |
+          cd dist
+          dvdisaster.exe --version
+    - name: regression tests
+      run: mkdir /var/tmp/regtest && export REGTEST_NO_UTF8=1 && ./regtest/runtests.sh
+
+  win32-gui:
+    runs-on: windows-2016
+    defaults:
+      run:
+        shell: msys2 {0}
+    steps:
+    - uses: msys2/setup-msys2@v2
+      with:
+        msystem: MINGW32
+        update: false
+        install: git diffutils make pkg-config mingw-w64-i686-gtk2 mingw-w64-i686-glib2 mingw-w64-i686-gcc mingw-w64-i686-ghostscript mingw-w64-i686-jq mingw-w64-i686-ntldd-git man zip
+    - run: git config --global core.autocrlf input
+      shell: bash
+    - uses: actions/checkout@v2
+    - name: configure
+      run: ./configure
+    - name: make
+      run: nproc && make -j$(nproc)
+    - name: check executable
+      run: |
+          ./dvdisaster.exe --version
+          file dvdisaster.exe
+          ./dvdisaster.exe --version | grep -q -e dirty -e NOGUI && exit 1
+          file dvdisaster.exe | grep -q '386, for MS Windows'
+    - name: prepare dist
+      run: ./.github/workflows/make-dist.sh ${{ github.ref }}
+      id: dist
+    - name: check executability of dist from cmd.exe
+      shell: cmd
+      run: |
+          cd dist
+          dvdisaster.exe --version
+    - name: regression tests
+      run: mkdir /var/tmp/regtest && export REGTEST_NO_UTF8=1 && ./regtest/runtests.sh
+
+  win64-cli:
+    runs-on: windows-2016
+    defaults:
+      run:
+        shell: msys2 {0}
+    steps:
+    - uses: msys2/setup-msys2@v2
+      with:
+        msystem: MINGW64
+        update: false
+        install: git diffutils make pkg-config mingw-w64-x86_64-glib2 mingw-w64-x86_64-gcc mingw-w64-x86_64-ghostscript mingw-w64-x86_64-jq mingw-w64-x86_64-ntldd-git man zip
+    - run: git config --global core.autocrlf input
+      shell: bash
+    - uses: actions/checkout@v2
+    - name: configure
+      run: env CLI_ONLY=1 ./configure
+    - name: make
+      run: nproc && make -j$(nproc)
+    - name: check executable
+      run: |
+          ./dvdisaster.exe --version
+          file dvdisaster.exe
+          ./dvdisaster.exe --version | grep -q -e dirty && exit 1
+          ./dvdisaster.exe --version | grep -q NOGUI
+          file dvdisaster.exe | grep -q 'x86-64, for MS Windows'
+    - name: prepare dist
+      run: ./.github/workflows/make-dist.sh ${{ github.ref }}
+      id: dist
+    - name: check executability of dist from cmd.exe
+      shell: cmd
+      run: |
+          cd dist
+          dvdisaster.exe --version
+    - name: regression tests
+      run: mkdir /var/tmp/regtest && export REGTEST_NO_UTF8=1 && ./regtest/runtests.sh
+
+  win32-cli:
+    runs-on: windows-2016
+    defaults:
+      run:
+        shell: msys2 {0}
+    steps:
+    - uses: msys2/setup-msys2@v2
+      with:
+        msystem: MINGW32
+        update: false
+        install: git diffutils make pkg-config mingw-w64-i686-glib2 mingw-w64-i686-gcc mingw-w64-i686-ghostscript mingw-w64-i686-jq mingw-w64-i686-ntldd-git man zip
+    - run: git config --global core.autocrlf input
+      shell: bash
+    - uses: actions/checkout@v2
+    - name: configure
+      run: env CLI_ONLY=1 ./configure
+    - name: make
+      run: nproc && make -j$(nproc)
+    - name: check executable
+      run: |
+          ./dvdisaster.exe --version
+          file dvdisaster.exe
+          ./dvdisaster.exe --version | grep -q -e dirty && exit 1
+          ./dvdisaster.exe --version | grep -q NOGUI
+          file dvdisaster.exe | grep -q '386, for MS Windows'
+    - name: prepare dist
+      run: ./.github/workflows/make-dist.sh ${{ github.ref }}
+      id: dist
+    - name: check executability of dist from cmd.exe
+      shell: cmd
+      run: |
+          cd dist
+          dvdisaster.exe --version
+    - name: regression tests
+      run: mkdir /var/tmp/regtest && export REGTEST_NO_UTF8=1 && ./regtest/runtests.sh
+
+  linux64-cli:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: install prerequisites
+      run: sudo apt update && sudo apt install -y libglib2.0-dev ghostscript man jq
+    - name: configure
+      run: env CLI_ONLY=1 ./configure
+    - name: make
+      run: nproc && make -j$(nproc)
+    - name: check executability
+      run: ./dvdisaster --version
+    - name: check executable
+      run: file dvdisaster && file dvdisaster | grep -q 'ELF 64'
+    - name: prepare dist
+      run: ./.github/workflows/make-dist.sh ${{ github.ref }}
+    - name: regression tests
+      run: mkdir /var/tmp/regtest && export REGTEST_NO_UTF8=1 && ./regtest/runtests.sh
+
   linux64-gui:
     runs-on: ubuntu-latest
 
     steps:
     - uses: actions/checkout@v2
     - name: install prerequisites
-      run: sudo apt update && sudo apt install -y libgtk2.0-dev libglib2.0-dev
+      run: sudo apt update && sudo apt install -y libglib2.0-dev ghostscript man jq libgtk2.0-dev
     - name: configure
       run: ./configure
     - name: make
@@ -19,127 +180,8 @@ jobs:
       run: ./dvdisaster --version
     - name: check executable
       run: file dvdisaster && file dvdisaster | grep -q 'ELF 64'
+    - name: prepare dist
+      run: ./.github/workflows/make-dist.sh ${{ github.ref }}
     - name: regression tests
       run: mkdir /var/tmp/regtest && export REGTEST_NO_UTF8=1 && ./regtest/runtests.sh
 
-  linux64-cli:
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v2
-    - name: install prerequisites
-      run: sudo apt update && sudo apt install -y libglib2.0-dev
-    - name: configure
-      run: env CLI_ONLY=1 ./configure
-    - name: make
-      run: nproc && make -j$(nproc)
-    - name: check executability
-      run: ./dvdisaster --version
-    - name: check executable
-      run: file dvdisaster && file dvdisaster | grep -q 'ELF 64'
-    - name: regression tests
-      run: mkdir /var/tmp/regtest && export REGTEST_NO_UTF8=1 && ./regtest/runtests.sh
-
-  win64-gui:
-    runs-on: windows-2016
-
-    defaults:
-      run:
-        shell: msys2 {0}
-    steps:
-    - uses: msys2/setup-msys2@v2
-      with:
-        msystem: MINGW64
-        update: false
-        install: git diffutils make pkg-config mingw-w64-x86_64-gtk2 mingw-w64-x86_64-glib2 mingw-w64-x86_64-gcc
-    - run: git config --global core.autocrlf input
-      shell: bash
-    - uses: actions/checkout@v2
-    - name: configure
-      run: ./configure
-    - name: make
-      run: nproc && make -j$(nproc)
-    - name: check executability
-      run: ./dvdisaster.exe --version
-    - name: check executable
-      run: file dvdisaster.exe && file dvdisaster.exe | grep -q 'x86-64, for MS Windows'
-    - name: regression tests
-      run: mkdir /var/tmp/regtest && export REGTEST_NO_UTF8=1 && ./regtest/runtests.sh
-
-  win32-gui:
-    runs-on: windows-2016
-
-    defaults:
-      run:
-        shell: msys2 {0}
-    steps:
-    - uses: msys2/setup-msys2@v2
-      with:
-        msystem: MINGW32
-        update: false
-        install: git diffutils make pkg-config mingw-w64-i686-gtk2 mingw-w64-i686-glib2 mingw-w64-i686-gcc
-    - run: git config --global core.autocrlf input
-      shell: bash
-    - uses: actions/checkout@v2
-    - name: configure
-      run: ./configure
-    - name: make
-      run: nproc && make -j$(nproc)
-    - name: check executability
-      run: ./dvdisaster.exe --version
-    - name: check executable
-      run: file dvdisaster.exe && file dvdisaster.exe | grep -q '386, for MS Windows'
-    - name: regression tests
-      run: mkdir /var/tmp/regtest && export REGTEST_NO_UTF8=1 && ./regtest/runtests.sh
-
-  win64-cli:
-    runs-on: windows-2016
-
-    defaults:
-      run:
-        shell: msys2 {0}
-    steps:
-    - uses: msys2/setup-msys2@v2
-      with:
-        msystem: MINGW64
-        update: false
-        install: git diffutils make pkg-config mingw-w64-x86_64-glib2 mingw-w64-x86_64-gcc
-    - run: git config --global core.autocrlf input
-      shell: bash
-    - uses: actions/checkout@v2
-    - name: configure
-      run: env CLI_ONLY=1 ./configure
-    - name: make
-      run: nproc && make -j$(nproc)
-    - name: check executability
-      run: ./dvdisaster.exe --version
-    - name: check executable
-      run: file dvdisaster.exe && file dvdisaster.exe | grep -q 'x86-64, for MS Windows'
-    - name: regression tests
-      run: mkdir /var/tmp/regtest && export REGTEST_NO_UTF8=1 && ./regtest/runtests.sh
-
-  win32-cli:
-    runs-on: windows-2016
-
-    defaults:
-      run:
-        shell: msys2 {0}
-    steps:
-    - uses: msys2/setup-msys2@v2
-      with:
-        msystem: MINGW32
-        update: false
-        install: git diffutils make pkg-config mingw-w64-i686-glib2 mingw-w64-i686-gcc
-    - run: git config --global core.autocrlf input
-      shell: bash
-    - uses: actions/checkout@v2
-    - name: configure
-      run: env CLI_ONLY=1 ./configure
-    - name: make
-      run: nproc && make -j$(nproc)
-    - name: check executability
-      run: ./dvdisaster.exe --version
-    - name: check executable
-      run: file dvdisaster.exe && file dvdisaster.exe | grep -q '386, for MS Windows'
-    - name: regression tests
-      run: mkdir /var/tmp/regtest && export REGTEST_NO_UTF8=1 && ./regtest/runtests.sh

CHANGELOG

@@ -5,6 +5,7 @@
 - feat: add --permissive-medium-type option
 - fix: lift the limitation on the number of cmdline args
 - fix: lift segfault when aborting adaptive read
+- chore: re-enable adaptive read regtests
 - chore: move *.c *.h to src/, and build in build/
 - chore: build: finally really fix make parallelism
 - chore: use gcc -pipe to speed up the build

regtest/common.bash

@@ -28,6 +28,8 @@ if ! $MD5SUM $RNDSEQ >/dev/null 2>&1; then
     MD5SUM=../simple-md5sum
 fi
 
+nbfailed=0
+
 # Assemble sed expressions for removal of variable output contents
 
 SED_REMOVE_ISO_DIR="([a-zA-Z]:/[a-zA-Z0-9/]+)?${ISODIR}/"
@@ -44,12 +46,13 @@ fi
 # Usage
 
 if test "$1" == "--help" || test "$1" == "-h"; then
-    echo "Usage: $0 [gui] [all|cont <test case>]"
+    echo "Usage: $0 [gui] [all|[cont|only] <test case>]"
     exit 1;
 fi
 
 doall="no"
 cont_at="false"
+only_this_one="false"
 gui_mode="false"
 
 param=($*)
@@ -59,6 +62,7 @@ case "${param[0]}" in
 	gui_mode="true"
 	param[0]="${param[1]}"
 	param[1]="${param[2]}"
+	param[2]="${param[3]}"
 	;;
 esac
 	
@@ -69,6 +73,9 @@ case "${param[0]}" in
     cont)
 	cont_at="${param[1]}"
 	;;
+    only)
+	only_this_one="${param[1]}"
+	;;
 esac
 
 # Sanity check
@@ -118,9 +125,19 @@ function try()
        cont_at="false"
    fi
 
+   if test "$only_this_one" != "false"; then
+       if test "$only_this_one" != "${CODEC_PREFIX}_$2"; then
+           return 1
+       elif test "$only_this_one" == "done_please_exit"; then
+           exit $nbfailed
+       else
+           only_this_one="done_please_exit"
+       fi
+   fi
+
    doit=$(echo $doit | cut -d\  -f 2) 
 
-   if test $doall = "yes" || test $doit = "yes"; then
+   if test $doall = "yes" || test $doit = "yes" || test $only_this_one != "false"; then
        # Clean up temporary files
        if test -n "$TMPISO" && test -f "$TMPISO"; then
 	   rm -f $TMPISO
@@ -222,7 +239,9 @@ 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 ]; then
+     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
 	     sed -i -re "s=device $NON_EXISTENT_DEVICE\.=/dev/sdz: No such file or directory=" $NEWLOG
      fi
@@ -236,17 +255,21 @@ function run_regtest()
 	 cat ${DIFFLOG}
 
 	 if test "$interactive_diff" == "yes"; then
-	   echo
+	   while true; do
-	   echo ">> The diff can also be seen with: vimdiff $REFLOG $NEWLOG"
+	      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; any other key to fail this test:" -e answer
+	      if test "$answer" == "a"; then
-	   if test "$answer" == "a"; then
+	         cp $REFLOG $LOGDIR
-	       cp $REFLOG $LOGDIR
+	         head -n 2 $LOGDIR/${CODEC_PREFIX}_${testsymbol} >$REFLOG 
-	       head -n 2 $LOGDIR/${CODEC_PREFIX}_${testsymbol} >$REFLOG 
+	         sed -e "s=${SED_REMOVE_ISO_DIR}==g" $NEWLOG >>$REFLOG
-	       sed -e "s=${SED_REMOVE_ISO_DIR}==g" $NEWLOG >>$REFLOG
+	         pass="skip"
-	       pass="skip"
+	      elif test "$answer" == "v"; then
-	   else
+	         vimdiff $REFLOG $NEWLOG
-	       pass="false"
+	         continue
-	   fi
+	      else
+	         pass="false"
+	      fi
+	      break
+	   done
 	 else
 	   pass="false"
 	 fi
@@ -313,6 +336,8 @@ function run_regtest()
       ;;
      
      *)
+      nbfailed=$((nbfailed + 1))
+      [ $nbfailed -ge 256 ] && nbfailed=255
       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)

regtest/config.txt

@@ -1,6 +1,6 @@
 # Global toggles
 
-FAIL_ON_BAD yes
+FAIL_ON_BAD no
 SPAWN_LOG_WINDOW no
 INTERACTIVE_DIFF yes
 

regtest/database/RS01_adapive_wrong_fp_with_ecc

@@ -9,6 +9,7 @@ Device: sim-cd, Simulated CD drive 1.00
 Using READ CD.
 Medium "Random Image": CD-R mode 1, 21000 sectors, created 16-07-2006.
 
+RS01-type ECC found
 Adaptive reading: Trying to collect enough data for error correction.
 
 *

regtest/database/RS01_adaptive_crc_errors_with_ecc

@@ -9,6 +9,7 @@ Device: sim-cd, Simulated CD drive 1.00
 Using READ CD.
 Medium "Random Image": CD-R mode 1, 21000 sectors, created 16-07-2006.
 
+RS01-type ECC found
 Adaptive reading: Trying to collect enough data for error correction.
 Creating new rs01-tmp.iso image.
 Repairable:  0.0% (correctable: 0; now reading [0..20999], size 21000)

regtest/database/RS01_adaptive_defective_large_skip

@@ -86,7 +86,7 @@ try_sector: trying sector 20850
 try_sector: no cookie, skipping current modulo
 RS02Recognize: skipping exhaustive RS02 search
 ...trying RS03
-RS03Recognize: medium sim-cd
+RS03RecognizeImage: medium sim-cd
 FindRS03HeaderInImage: medium sim-cd
 RS03RecognizeImage: skipping exhaustive RS03 search
 ...no augmented image detected.

regtest/database/RS01_adaptive_defective_no_ecc

@@ -86,7 +86,7 @@ try_sector: trying sector 20850
 try_sector: no cookie, skipping current modulo
 RS02Recognize: skipping exhaustive RS02 search
 ...trying RS03
-RS03Recognize: medium sim-cd
+RS03RecognizeImage: medium sim-cd
 FindRS03HeaderInImage: medium sim-cd
 RS03RecognizeImage: skipping exhaustive RS03 search
 ...no augmented image detected.

regtest/database/RS01_adaptive_longer_with_ecc

@@ -9,6 +9,7 @@ Device: sim-cd, Simulated CD drive 1.00
 Using READ CD.
 Medium "Random Image": CD-R mode 1, 21044 sectors, created 16-07-2006.
 
+RS01-type ECC found
 Adaptive reading: Trying to collect enough data for error correction.
 * Warning: Medium contains 44 sectors more as recorded in the .ecc file
 *          (Medium: 21044 sectors; expected from .ecc file: 21000 sectors).

regtest/database/RS01_adaptive_shorter_with_ecc

@@ -9,6 +9,7 @@ Device: sim-cd, Simulated CD drive 1.00
 Using READ CD.
 Medium "Random Image": CD-R mode 1, 20956 sectors, created 16-07-2006.
 
+RS01-type ECC found
 Adaptive reading: Trying to collect enough data for error correction.
 * Warning: Medium contains 44 sectors less as recorded in the .ecc file
 *          (Medium: 20956 sectors; expected from .ecc file: 21000 sectors).

regtest/database/RS01_adaptive_tao_tail_with_ecc

@@ -9,6 +9,7 @@ Device: sim-cd, Simulated CD drive 1.00
 Using READ CD.
 Medium "Random Image": CD-R mode 1, 21002 sectors, created 16-07-2006.
 
+RS01-type ECC found
 Adaptive reading: Trying to collect enough data for error correction.
 * Warning: Medium contains 2 sectors more as recorded in the .ecc file
 *          (Medium: 21002 sectors; expected from .ecc file: 21000 sectors).

regtest/database/RS02_adaptive_incompatible_ecc

@@ -9,6 +9,7 @@ Device: sim-cd, Simulated CD drive 1.00
 Using READ CD.
 Medium "Random Image": CD-R mode 1, 34932 sectors, Ecc, created 16-07-2006.
 
+RS02-type ECC found
 * Warning: This image requires dvdisaster-99.99!
 *          Proceeding could trigger incorrect behaviour.
 *          Please visit http://www.dvdisaster.org for an upgrade.

regtest/database/RS02_adaptive_missing_data_sectors

@@ -9,6 +9,7 @@ Device: sim-cd, Simulated CD drive 1.00
 Using READ CD.
 Medium "Random Image": CD-R mode 1, 34932 sectors, Ecc, created 16-07-2006.
 
+RS02-type ECC found
 Adaptive reading: Trying to collect enough data for error correction.
 Creating new rs02-tmp.iso image.
 Repairable:  0.2% (missing: 34932; now reading [0..34931], size 34932)Repairable:  0.3% (missing: 34900; now reading [0..34931], size 34932)Repairable:  0.4% (missing: 34868; now reading [0..34931], size 34932)Repairable:  0.5% (missing: 34820; now reading [0..34931], size 34932)Repairable:  0.6% (missing: 34788; now reading [0..34931], size 34932)Repairable:  0.7% (missing: 34756; now reading [0..34931], size 34932)Repairable:  0.8% (missing: 34724; now reading [0..34931], size 34932)Repairable:  0.9% (missing: 34692; now reading [0..34931], size 34932)Repairable:  1.0% (missing: 34644; now reading [0..34931], size 34932)Repairable:  1.1% (missing: 34612; now reading [0..34931], size 34932)Repairable:  1.2% (missing: 34580; now reading [0..34931], size 34932)Repairable:  1.3% (missing: 34548; now reading [0..34931], size 34932)Repairable:  1.4% (missing: 34516; now reading [0..34931], size 34932)Repairable:  1.5% (missing: 34484; now reading [0..34931], size 34932)Repairable:  1.6% (missing: 34436; now reading [0..34931], size 34932)Repairable:  1.7% (missing: 34404; now reading [0..34931], size 34932)Repairable:  1.8% (missing: 34372; now reading [0..34931], size 34932)Repairable:  1.9% (missing: 34340; now reading [0..34931], size 34932)Repairable:  2.0% (missing: 34308; now reading [0..34931], size 34932)Repairable:  2.1% (missing: 34260; now reading [0..34931], size 34932)Repairable:  2.2% (missing: 34228; now reading [0..34931], size 34932)Repairable:  2.3% (missing: 34196; now reading [0..34931], size 34932)Repairable:  2.4% (missing: 34164; now reading [0..34931], size 34932)Repairable:  2.5% (missing: 34132; now reading [0..34931], size 34932)Repairable:  2.6% (missing: 34084; now reading [0..34931], size 34932)Repairable:  2.7% (missing: 34052; now reading [0..34931], size 34932)Repairable:  2.8% (missing: 34020; now reading [0..34931], size 34932)Repairable:  2.9% (missing: 33988; now reading [0..34931], size 34932)Repairable:  3.0% (missing: 33956; now reading [0..34931], size 34932)Sector 992, try 1: Medium Error; Unrecovered read error.

regtest/database/RS02_adaptive_with_wrong_rs01_file

@@ -9,6 +9,7 @@ Device: sim-cd, Simulated CD drive 1.00
 Using READ CD.
 Medium "Random Image": CD-R mode 1, 34932 sectors, Ecc, created 16-07-2006.
 
+RS01-type ECC found
 Adaptive reading: Trying to collect enough data for error correction.
 
 *

regtest/rs01.bash

@@ -441,7 +441,7 @@ fi
 # Tests whether CRC and ECC information is taken from the read process,
 # not the wrong ecc file.
 
-if false && try "read image with wrong ecc (RS01) and create new ecc" ecc_recreate_after_read_wrong_rs01; then
+if try "read image with wrong ecc (RS01) and create new ecc" ecc_recreate_after_read_wrong_rs01; then
   cp $MASTERISO $SIMISO
 
   $NEWVER --debug -i$TMPISO --random-image $((ISOSIZE-777)) --random-seed 1337 >>$LOGFILE 2>&1
@@ -1478,9 +1478,6 @@ fi
 
 REGTEST_SECTION="Reading tests (adaptive)"
 
-echo "Currently not enabled!"
-exit $nbfailed
-
 # Read good image with error correction data available
 
 if try "reading good image" adaptive_good; then

regtest/rs02.bash

@@ -730,7 +730,7 @@ fi
 
 # Fix image containing 137 extra bytes
 
-if false && try "trying to fix image with 137 extra bytes" fix_image_plus137; then
+if try "trying to fix image with 137 extra bytes" fix_image_plus137; then
   # Test possibly broken on upstream 0.79.6, forcefully ignoring
 
   cp $ISO_PLUS137 $TMPISO
@@ -743,7 +743,7 @@ fi
 # error in the zero-padded area following the 137 bytes.
 # Both shall be corrected.
 
-if false && try "trying to fix image with error in 137 extra bytes" fix_image_error_in_plus137; then
+if try "trying to fix image with error in 137 extra bytes" fix_image_error_in_plus137; then
   # Test possibly broken on upstream 0.79.6, forcefully ignoring
 
   cp $ISO_PLUS137 $TMPISO
@@ -1775,9 +1775,6 @@ fi
 
 REGTEST_SECTION="Reading tests (adaptive)"
 
-echo "Currently not enabled!"
-exit $nbfailed
-
 # Read complete / optimal image
 
 if try "reading good image" adaptive_good; then

regtest/runtests.sh

@@ -6,4 +6,5 @@ for i in rs*.bash; do
    allfailed=$((allfailed + ret))
 done
 echo Failed $allfailed tests
+[ $allfailed -ge 256 ] allfailed=255
 exit $allfailed