aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2016-11-29 10:12:51 +0100
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2016-11-29 11:32:11 +0000
commit1a7a24c780eb460f52f9daf91f4b75e136ece4a7 (patch)
treedee7275cfb608935c496f6d9ef27a30bb52bd417
parent225e0840a2e6afef8b155a1281923f0725cb7c58 (diff)
testrunner.py: Allow character '-' in test names
The script was mistakenly reporting FAIL : QtCore::bug_PYSIDE() for FAIL : QtCore::bug_PYSIDE-164() Fix by extending the regular expression. Change-Id: Id6ca4c75489bd577e25723efd62840f714e67ae4 Reviewed-by: Christian Tismer <tismer@stackless.com>
-rw-r--r--testrunner.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/testrunner.py b/testrunner.py
index e342189e8..c648bb201 100644
--- a/testrunner.py
+++ b/testrunner.py
@@ -256,7 +256,7 @@ Example output:
ip1 n sharp mod_name code tim
-----------------------------------------------------------------------------------------
-114/391 Test #114: QtCore_qfileinfo_test ........................... Passed 0.10 sec
+114/391 Test #114: QtCore_qfileinfo_test-42 ........................ Passed 0.10 sec
Start 115: QtCore_qfile_test
115/391 Test #115: QtCore_qfile_test ...............................***Failed 0.11 sec
Start 116: QtCore_qflags_test
@@ -282,7 +282,7 @@ _TEST_PAT = r"""
([0-9]+) # sharp
: # colon symbol ':'
\s+ # some WS
- (\w+) # mod_name
+ ([\w-]+) # mod_name
.*? # whatever (non greedy)
( #
(Passed) # either "Passed", None