From fc141f874a7274888fb52b31f763145f0c627421 Mon Sep 17 00:00:00 2001
From: Ralph Lange <ralph.lange@gmx.de>
Date: Fri, 27 Mar 2020 16:32:54 +0100
Subject: [PATCH] appveyor: run unit tests via matrix 'only' setting

---
 .appveyor.yml    | 15 ++++++++++++++-
 appveyor-test.py | 15 +++++----------
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 4c6642a..047555d 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -95,14 +95,27 @@ matrix:
   - platform: x64
     CC: vs2008
 
+# Run test script for unit tests (SET = test00)
+for:
+-
+  matrix:
+    only:
+      - SET: test00
+  build_script:
+    - cmd: python appveyor-test.py
+  test_script:
+    - cmd: echo Tests have been run in the build phase
 
 #---------------------------------#
 #     building & testing          #
 #---------------------------------#
 
 build_script:
-  - cmd: python appveyor-test.py
+  - cmd: python appveyor/do.py prepare
+  - cmd: python appveyor/do.py build
 
+test_script:
+  - cmd: python appveyor/do.py test
 
 #---------------------------------#
 #         debugging               #
diff --git a/appveyor-test.py b/appveyor-test.py
index ef4a727..8f782be 100644
--- a/appveyor-test.py
+++ b/appveyor-test.py
@@ -248,14 +248,9 @@ class TestVCVars(unittest.TestCase):
         do.with_vcvars('env')
 
 if __name__ == "__main__":
-    if 'SET' in os.environ and os.environ['SET'] == "test00":
-        do.host_info()
-        if sys.argv[1:]==['env']:
-            # testing with_vcvars
-            [print(K,'=',V) for K, V in os.environ.items()]
-        else:
-            unittest.main()
+    do.host_info()
+    if sys.argv[1:]==['env']:
+        # testing with_vcvars
+        [print(K,'=',V) for K, V in os.environ.items()]
     else:
-        do.main(['prepare'])
-        do.main(['build'])
-        do.main(['test'])
+        unittest.main()