Fix Appveyor builds

mdbtools · Dec 21, 2020 · 307cc50 · 307cc50
1 parent cb0ee05
commit 307cc50
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 4 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -22,7 +22,9 @@ jobs:
       - name: Make
         run: make
       - name: CLI tests
-        run: ./test_script.sh
+        run: bash -x ./test_script.sh
+      - name: SQL tests
+        run: bash -x ./test_sql.sh
       - name: ODBC tests
         run: env MDBPATH=test/data ./src/odbc/unittest
       - name: pkg-config libmdb test
@@ -51,7 +53,9 @@ jobs:
       - name: Make
         run: make
       - name: CLI tests
-        run: ./test_script.sh
+        run: bash -x ./test_script.sh
+      - name: SQL tests
+        run: bash -x ./test_sql.sh
       - name: ODBC tests
         run: env MDBPATH=test/data ./src/odbc/unittest
       - name: pkg-config libmdb test

diff --git a/appveyor.yml b/appveyor.yml
@@ -43,6 +43,7 @@ test_script:
       {
         $env:MSYSTEM="MINGW64"
         C:\msys64\usr\bin\bash -l -c "cd /c/projects/mdbtools && ./test_script.sh"
+        C:\msys64\usr\bin\bash -l -c "cd /c/projects/mdbtools && ./test_sql.sh"
       }
       else
       {

diff --git a/test_script.sh b/test_script.sh
@@ -1,4 +1,4 @@
-#!/bin/bash -x
+#!/bin/bash
 
 # Simple test script; run after performing
 # git clone https://github.com/mdbtools/mdbtestdata.git test
@@ -14,5 +14,4 @@
 ./src/util/mdb-tables test/data/nwind.mdb
 ./src/util/mdb-ver test/data/ASampleDatabase.accdb
 ./src/util/mdb-ver test/data/nwind.mdb
-./src/util/mdb-sql -i test/sql/nwind.sql test/data/nwind.mdb
 ./src/util/mdb-queries test/data/ASampleDatabase.accdb qryCostsSummedByOwner
diff --git a/test_sql.sh b/test_sql.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+# Simple test script; run after performing
+# git clone https://github.com/mdbtools/mdbtestdata.git test
+./src/util/mdb-sql -i test/sql/nwind.sql test/data/nwind.mdb