1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

testlib/selftests: Fix generate_expected_output.py

Browse Source 
Hardcode the tests which were previously scanned from the source.

See qtbase/24e83de8d1924b8003c84f1df05b7befea2c5120.

Change-Id: I8fb05568977f86726b20948a9c2d1cfce5cba161
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
This commit is contained in:
Friedemann Kleint 2020-07-17 16:17:35 +02:00
parent ae5d021f45
commit 40bc8d5129
1 changed files with 22 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
tests/auto/testlib/selftests/generate_expected_output.py
View File

@ -43,6 +43,22 @@ import os
import subprocess import subprocess
import re import re
TESTS = ['assert', 'badxml', 'benchlibcallgrind', 'benchlibcounting',
'benchlibeventcounter', 'benchliboptions', 'benchlibtickcounter',
'benchlibwalltime', 'blacklisted', 'cmptest', 'commandlinedata',
'counting', 'crashes', 'datatable', 'datetime', 'deleteLater',
'deleteLater_noApp', 'differentexec', 'exceptionthrow', 'expectfail',
'failcleanup', 'faildatatype', 'failfetchtype', 'failinit',
'failinitdata', 'fetchbogus', 'findtestdata', 'float', 'globaldata',
'longstring', 'maxwarnings', 'multiexec', 'pairdiagnostics', 'pass',
'printdatatags', 'printdatatagswithglobaltags', 'qexecstringlist',
'signaldumper', 'silent', 'singleskip', 'skip', 'skipcleanup',
'skipinit', 'skipinitdata', 'sleep', 'strcmp', 'subtest', 'testlib',
'tuplediagnostics', 'verbose1', 'verbose2', 'verifyexceptionthrown',
'warnings', 'watchdog', 'xunit']
class Fail (Exception): pass class Fail (Exception): pass
class Cleaner (object): class Cleaner (object):
@ -184,52 +200,24 @@ class Scanner (object):
list. Its .subdirs() can then filter a user-supplied list of list. Its .subdirs() can then filter a user-supplied list of
subdirs or generate the full list, when the user supplied subdirs or generate the full list, when the user supplied
none.""" none."""
def __init__(self, srcDir): def __init__(self):
self.__tested = tuple(self.__scan_cpp(os.path.join(srcDir, 'tst_selftests.cpp'))) pass
@staticmethod
def __scan_cpp(name,
trimc = re.compile(r'/\*.*?\*/').sub,
trimcpp = re.compile(r'//.*$').sub,
first = re.compile(r'(QStringList|auto)\s+tests\s*=\s*QStringList\(\)').match,
match = re.compile(r'(?:tests\s*)?<<\s*"(\w+)"').match,
last = re.compile(r'\bfor.*\b(LoggerSet|auto)\b.*\ballLoggerSets\(\)').search):
"""Scans tst_selftests.cpp to find which subdirs matter.
There's a list, tests, to which all subdir names get added, if
they're to be tested. Other sub-dirs aren't tested, so
there's no sense in generating output for them."""
scan = False
with open(name) as src:
for line in src:
line = trimcpp('', trimc('', line.strip())).strip()
if not scan:
got = first(line)
if got:
scan, line = True, line[len(got.group()):]
if scan:
if last(line): break
got = match(line)
while got:
yield got.group(1)
line = line[len(got.group()):].strip()
got = match(line)
def subdirs(self, given): def subdirs(self, given):
if given: if given:
for d in given: for d in given:
if not os.path.isdir(d): if not os.path.isdir(d):
print('No such directory:', d, '- skipped') print('No such directory:', d, '- skipped')
elif d in self.__tested: elif d in TESTS:
yield d yield d
else: else:
print('Directory', d, 'is not tested by tst_selftests.cpp') print('Directory', d, 'is not in the list of tests')
else: else:
for d in self.__tested: for d in self.__tested:
if os.path.isdir(d): if os.path.isdir(d):
yield d yield d
else: else:
print('tst_selftests.cpp names', d, "as a test, but it doesn't exist") print('directory ', d, " doesn't exist, was it removed?")
del re del re
# Keep in sync with tst_selftests.cpp's processEnvironment(): # Keep in sync with tst_selftests.cpp's processEnvironment():
@ -324,7 +312,7 @@ def main(name, *args):
herePath = os.getcwd() herePath = os.getcwd()
cleaner = Cleaner(herePath, name) cleaner = Cleaner(herePath, name)
tests = tuple(Scanner(cleaner.sourceDir).subdirs(args)) tests = tuple(Scanner().subdirs(args))
print("Generating", len(tests), "test results for", cleaner.version, "in:", herePath) print("Generating", len(tests), "test results for", cleaner.version, "in:", herePath)
for path in tests: for path in tests:
generateTestData(path, cleaner.clean) generateTestData(path, cleaner.clean)