From 55038b731516f22584b7e1cede4ef0a05b8b647e Mon Sep 17 00:00:00 2001
From: Ralph Lange <ralph.lange@gmx.de>
Date: Tue, 26 May 2020 17:32:20 +0200
Subject: [PATCH] Improve test make-target logic

- make runtests if no valid test-results target exists
(closes #41)
---
 appveyor/do.py  | 4 +++-
 travis/build.sh | 9 +++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/appveyor/do.py b/appveyor/do.py
index 6286bce..8887437 100644
--- a/appveyor/do.py
+++ b/appveyor/do.py
@@ -575,9 +575,11 @@ def build(args):
 def test(args):
     setup_for_build(args)
     print('{0}Running the main module tests{1}'.format(ANSI_YELLOW, ANSI_RESET))
-    call_make(['tapfiles'])
     if has_test_results:
+        call_make(['tapfiles'])
         call_make(['test-results'], parallel=0, silent=True)
+    else:
+        call_make(['runtests'])
 
 def doExec(args):
     'exec user command with vcvars'
diff --git a/travis/build.sh b/travis/build.sh
index 0f02964..f282614 100755
--- a/travis/build.sh
+++ b/travis/build.sh
@@ -36,11 +36,12 @@ ret=0
 
 if [ "$TEST" != "NO" ]
 then
-  make -j2 tapfiles || ret=$?
-
-  if grep -q "BASE_3_14=NO" $EPICS_BASE/configure/CONFIG_BASE_VERSION
+  if grep -q "BASE_3_14\s*=\s*NO" $EPICS_BASE/configure/CONFIG_BASE_VERSION && grep -q "^test-results:" $EPICS_BASE/configure/RULES_BUILD
   then
-    grep -q "^test-results:" $EPICS_BASE/configure/RULES_BUILD && make -sk test-results
+    make -j2 tapfiles || ret=$?
+    make -sk test-results
+  else
+    make runtests
   fi
 fi