From c4230973267c60f0802a7c1c7dc438e36881d520 Mon Sep 17 00:00:00 2001
From: Michele Locati <michele@locati.it>
Date: Fri, 6 Oct 2023 23:00:07 +0200
Subject: [PATCH] Fix invalid byte sequence error when running test_script.sh
 in some cases (#423)

This fixes the following error that may occur:
argument parsing failed: Invalid byte sequence in conversion input
---
 .github/workflows/build.yml | 30 ++++++++++++++++++++++--------
 .gitignore                  |  4 ++--
 test_script.sh              |  9 ++++++++-
 3 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 04d6f51..273ecd9 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,5 +1,7 @@
 name: build
 on: [ push, pull_request ]
+env:
+  TEST_DATA_URL: https://github.com/mdbtools/mdbtestdata/archive/refs/heads/master.tar.gz
 jobs:
   linux:
     runs-on: ubuntu-latest
@@ -14,7 +16,10 @@ jobs:
         run: sudo apt install gettext
       - uses: actions/checkout@v2
       - name: Fetch test data
-        run: git clone https://github.com/mdbtools/mdbtestdata.git test
+        run: |
+          rm -rf test
+          mkdir test
+          curl -sSLf "$TEST_DATA_URL" | tar xz --strip-components=1 -C test
       - name: Autoconf
         run: autoreconf -i -f
       - name: Configure
@@ -24,7 +29,7 @@ jobs:
       - name: Make
         run: make
       - name: CLI tests
-        run: bash -e -x ./test_script.sh
+        run: ./test_script.sh
       - name: SQL tests
         run: bash -e -x ./test_sql.sh
       - name: ODBC tests
@@ -52,7 +57,10 @@ jobs:
         run: brew install bison gawk automake
       - uses: actions/checkout@v2
       - name: Fetch test data
-        run: git clone https://github.com/mdbtools/mdbtestdata.git test
+        run: |
+          rm -rf test
+          mkdir test
+          curl -sSLf "$TEST_DATA_URL" | tar xz --strip-components=1 -C test
       - name: Autoconf
         run: autoreconf -i -f
       - name: Configure
@@ -63,7 +71,7 @@ jobs:
       - name: Make
         run: make
       - name: CLI tests
-        run: bash -e -x ./test_script.sh
+        run: ./test_script.sh
       - name: SQL tests
         run: bash -e -x ./test_sql.sh
       - name: ODBC tests
@@ -94,7 +102,10 @@ jobs:
         run: echo /usr/local/opt/libiodbc/bin >> $GITHUB_PATH
       - uses: actions/checkout@v2
       - name: Fetch test data
-        run: git clone https://github.com/mdbtools/mdbtestdata.git test
+        run: |
+          rm -rf test
+          mkdir test
+          curl -sSLf "$TEST_DATA_URL" | tar xz --strip-components=1 -C test
       - name: Autoconf
         run: autoreconf -i -f
       - name: Configure
@@ -129,8 +140,11 @@ jobs:
             git
             glib2-devel
       - uses: actions/checkout@v2
-      - name: Check out test data
-        run: git clone https://github.com/mdbtools/mdbtestdata.git test
+      - name: Fetch test data
+        run: |
+          rm -rf test
+          mkdir test
+          curl -sSLf "$TEST_DATA_URL" | tar xz --strip-components=1 -C test
       - name: Autoconf
         run: autoreconf -i -f
       - name: Configure
@@ -138,6 +152,6 @@ jobs:
       - name: Make
         run: make
       - name: Test
-        run: bash -e -x ./test_script.sh
+        run: ./test_script.sh
       - name: SQL Test
         run: bash -e -x ./test_sql.sh
diff --git a/.gitignore b/.gitignore
index d946b1d..9bea8d2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,6 +17,7 @@ m4/
 config.log
 config.status
 configure
+/configure~
 Makefile.in
 Makefile
 doc/*.1
@@ -54,10 +55,9 @@ src/util/prkkd
 src/util/prole
 src/util/prtable
 src/util/updrow
-
+/test/
 ## apidocs docs related
 public/
 .sass-cache/
 *.css.map
 temp-man-pages/
-
diff --git a/test_script.sh b/test_script.sh
index 083fef9..6c4cf3e 100755
--- a/test_script.sh
+++ b/test_script.sh
@@ -1,4 +1,9 @@
-#!/bin/bash
+#!/bin/sh
+
+set -o errexit
+set -x
+
+LANG=C.UTF-8
 
 # Simple test script; run after performing
 # git clone https://github.com/mdbtools/mdbtestdata.git test
@@ -16,3 +21,5 @@
 ./src/util/mdb-ver test/data/ASampleDatabase.accdb
 ./src/util/mdb-ver test/data/nwind.mdb
 ./src/util/mdb-queries test/data/ASampleDatabase.accdb qryCostsSummedByOwner
+
+printf -- '\n\n%s Passed.\n' "$0"