From dce08e8d80d2a50ef446f480e1188e9ad92ce87b Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk002@yahoo.com>
Date: Sun, 6 Aug 2023 22:39:05 -0700
Subject: [PATCH 1/3] do a test run with blank init scripts

---
 .github/workflows/test.yml | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 9e58a649e..550e8d11e 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -50,7 +50,7 @@ jobs:
           plugins: "all"
 
   run-tests:
-    name: Test (${{ matrix.os }}, ${{ matrix.compiler }}, ${{ matrix.plugins }} plugins)
+    name: Test (${{ matrix.os }}, ${{ matrix.compiler }}, ${{ matrix.plugins }} plugins, ${{ matrix.config }} config)
     needs:
     - build-windows
     - build-linux
@@ -62,15 +62,20 @@ jobs:
           - os: windows
             compiler: msvc
             plugins: "default"
+            config: "default"
+          - os: windows
+            compiler: msvc
+            plugins: "default"
+            config: "empty"
           # TODO: uncomment once we have a linux build we can download from bay12
           # - os: ubuntu
           #   compiler: gcc-10
-          #   gcc: 10
           #   plugins: "default"
+          #   config: "default"
           # - os: ubuntu
-          #   compiler: gcc-10
-          #   gcc: 12
+          #   compiler: gcc-12
           #   plugins: "all"
+          #   config: "default"
     steps:
     - name: Set env
       shell: bash
@@ -98,6 +103,13 @@ jobs:
       with:
         path: ${{ env.DF_FOLDER }}
         key: df-${{ matrix.os }}-${{ env.DF_VERSION }}-${{ hashFiles('ci/download-df.sh') }}
+    - name: Install blank DFHack init scripts
+      if: matrix.config == 'empty'
+      shell: bash
+      run: |
+        mkdir -p dfhack-config/init
+        cd data/dfhack-config/init
+        for fname in *.init; do touch ../../../dfhack-config/init/$fname; done
     - name: Download DFHack
       uses: actions/download-artifact@v3
       with:

From 568e4b4725ee04dc4ba9b8724d1c34bb8c84ee72 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk002@yahoo.com>
Date: Sun, 6 Aug 2023 23:07:08 -0700
Subject: [PATCH 2/3] differentiate test output artifacts

---
 .github/workflows/test.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 550e8d11e..d06708778 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -107,9 +107,9 @@ jobs:
       if: matrix.config == 'empty'
       shell: bash
       run: |
-        mkdir -p dfhack-config/init
+        mkdir -p ${{ env.DF_FOLDER }}/dfhack-config/init
         cd data/dfhack-config/init
-        for fname in *.init; do touch ../../../dfhack-config/init/$fname; done
+        for fname in *.init; do touch ../../../${{ env.DF_FOLDER }}/dfhack-config/init/$fname; done
     - name: Download DFHack
       uses: actions/download-artifact@v3
       with:
@@ -125,7 +125,7 @@ jobs:
       if: always()
       continue-on-error: true
       with:
-        name: test-artifacts-msvc
+        name: test-output-${{ matrix.compiler }}-${{ matrix.plugins }}_plugins-${{ matrix.config }}_config
         path: |
           ${{ env.DF_FOLDER }}/dfhack-rpc.txt
           ${{ env.DF_FOLDER }}/test*.json

From 6f3843e375317c953392d5df20ab3a47e9aa62d6 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk002@yahoo.com>
Date: Sun, 6 Aug 2023 23:41:18 -0700
Subject: [PATCH 3/3] the test script is no longer in the hack path; remove
 extra script dir

---
 ci/run-tests.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ci/run-tests.py b/ci/run-tests.py
index a55bf3051..3d646a2f7 100755
--- a/ci/run-tests.py
+++ b/ci/run-tests.py
@@ -83,7 +83,6 @@ test_init_file = os.path.join(init_path, 'dfhackzzz_test.init')  # Core sorts th
 with open(test_init_file, 'w') as f:
     f.write('''
     devel/dump-rpc dfhack-rpc.txt
-    :lua dfhack.internal.addScriptPath(dfhack.getHackPath())
     test --resume -- lua scr.breakdown_level=df.interface_breakdown_types.%s
     ''' % ('NONE' if args.no_quit else 'QUIT'))