Fix parallel tests for sqlite, and enable parallel testing

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 920536c11570f3085b517018129479673ba508a6..548ee674fe14c5d5ec2096a48be5a6baf8f5c162 100644 (file)
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -339,7 +339,7 @@ jobs:
             $script
         done
 
-        make ci-test
+        make -j `nproc` ci-test
 
       env:
         SQL_MYSQL_TEST_SERVER: 127.0.0.1
@@ -363,7 +363,7 @@ jobs:
     - name: Run basic tests (MacOS)
       if: ${{ matrix.env.TEST_TYPE == 'macos' }}
       run: |
-        make test
+        make -j `nproc` test
       env:
         ASAN_OPTIONS: symbolize=1 detect_stack_use_after_return=1
 
@@ -375,7 +375,7 @@ jobs:
         # For fuzzing we won't be needing eapol_test
         mkdir -p build/tests/eapol_test
         : > build/tests/eapol_test/eapol_test.mk
-        make -j 8 test.fuzzer FUZZER_TIMEOUT=720
+        make -j `nproc` test.fuzzer FUZZER_TIMEOUT=720
         find build/fuzzer -type f ! -path 'build/fuzzer/*.log' | grep . && exit 1 || :
 
     - name: "Clang libFuzzer: Store assets on failure"

diff --git a/src/tests/modules/sql_sqlite/module.conf b/src/tests/modules/sql_sqlite/module.conf
index 1bf24752825186e716d81790430401ebdaa376f9..cd153a3549d8c58e9e9658bb8a9aaf7c75b7b994 100644 (file)
--- a/src/tests/modules/sql_sqlite/module.conf
+++ b/src/tests/modules/sql_sqlite/module.conf
@@ -3,7 +3,7 @@ sql {
        dialect = "sqlite"
        sqlite {
                # Path to the sqlite database
-               filename = "$ENV{MODULE_TEST_DIR}/sql_sqlite/rlm_sql_sqlite.db"
+               filename = "$ENV{MODULE_TEST_DIR}/sql_sqlite/$ENV{MODULE_TEST_UNLANG}/rlm_sql_sqlite.db"
 
                # If the file above does not exist and bootstrap is set
                # a new database file will be created, and the SQL statements