aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRolf Eike Beer <eike@sf-mail.de>2018-06-22 21:19:38 +0200
committerRolf Eike Beer <eike@sf-mail.de>2018-06-22 21:19:38 +0200
commitbc513236909c9efb11a4c6ec3c6eef85b72f4265 (patch)
treeb0e80da2990f9412f0f24ef9ab90c0f6bf338196
parentignore empty lines in package list (diff)
downloadtatt-bc513236909c9efb11a4c6ec3c6eef85b72f4265.tar.gz
tatt-bc513236909c9efb11a4c6ec3c6eef85b72f4265.tar.bz2
tatt-bc513236909c9efb11a4c6ec3c6eef85b72f4265.zip
run tests first before build testing the packages
Some packages have broken test suites that work only when the package is already installed. Run the test suite before and other build test to catch such errors.
-rw-r--r--tatt/scriptwriter.py14
1 files changed, 8 insertions, 6 deletions
diff --git a/tatt/scriptwriter.py b/tatt/scriptwriter.py
index 10f6cae..5cb5155 100644
--- a/tatt/scriptwriter.py
+++ b/tatt/scriptwriter.py
@@ -46,18 +46,20 @@ def scriptTemplate(job, config, filename):
def useCombiTestString(job, pack, config, port):
""" Build with diffent useflag combis """
usesnippet = scriptTemplate(job, config, "use-snippet")
-
- s = "" # This will contain the resulting string
usesnippet = usesnippet.replace("@@CPV@@", pack.packageString() )
+
+ # test once with tests and users flags
+ # do this first to trigger bugs in some packages where the test suite relies on
+ # the package being already installed
+ localsnippet = usesnippet.replace("@@USE@@", "")
+ localsnippet = localsnippet.replace("@@FEATURES@@", "FEATURES=\"${FEATURES} test\"")
+ s = localsnippet
+
usecombis = findUseFlagCombis (pack, config, port)
for uc in usecombis:
localsnippet = usesnippet.replace("@@USE@@", uc)
localsnippet = localsnippet.replace("@@FEATURES@@", "")
s = s + localsnippet
- # In the end we test once with tests and users flags
- localsnippet = usesnippet.replace("@@USE@@", "")
- localsnippet = localsnippet.replace("@@FEATURES@@", "FEATURES=\"${FEATURES} test\"")
- s = s + localsnippet
return s
def writeusecombiscript(job, config):