Do not run 'make test-results' on Base 3.14

- also add tests for this
This commit is contained in:
Ralph Lange
2020-05-13 11:11:58 +02:00
parent 53e23e3684
commit 11e2f1852b
3 changed files with 37 additions and 25 deletions

View File

@@ -419,12 +419,13 @@ def setup_for_build(args):
if 'BASE_3_14=YES' in myfile.read():
isbase314 = True
rules_build = os.path.join(base_place, 'configure', 'RULES_BUILD')
if os.path.exists(rules_build):
with open(rules_build) as myfile:
for line in myfile:
if re.match('^test-results:', line):
has_test_results = True
if not isbase314:
rules_build = os.path.join(base_place, 'configure', 'RULES_BUILD')
if os.path.exists(rules_build):
with open(rules_build) as myfile:
for line in myfile:
if re.match('^test-results:', line):
has_test_results = True
bindir = os.path.join(os.getcwd(), 'bin', os.environ['EPICS_HOST_ARCH'])
if os.path.isdir(bindir):