diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 16fe285b..0624ce24 100644 --- 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 index 5d73be3a..6a93ac3b 100644 --- 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 index 240a7a5e..94d5247a 100755 --- 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 new file mode 100755 index 00000000..0001ee01 --- /dev/null +++ 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