1
0
Fork 0

List skipped filenames as a bunch, not one per line.

This commit is contained in:
Willi Goesgens 2015-08-13 14:26:01 +02:00
parent d3cc9981b8
commit f6767d1fbd
1 changed files with 10 additions and 3 deletions

View File

@ -65,6 +65,12 @@ OutputDir = "/tmp/"
RunTests = {} RunTests = {}
################################################################################
### A list of tests that were skipped by the users request.
################################################################################
filterTestList = []
################################################################################ ################################################################################
### @brief arangosh expect ### @brief arangosh expect
### ###
@ -323,7 +329,7 @@ regularStartLine = re.compile(r'^(/// )? *@EXAMPLE_ARANGOSH_OUTPUT{([^}]*)}')
runLine = re.compile(r'^(/// )? *@EXAMPLE_ARANGOSH_RUN{([^}]*)}') runLine = re.compile(r'^(/// )? *@EXAMPLE_ARANGOSH_RUN{([^}]*)}')
def matchStartLine(line, filename): def matchStartLine(line, filename):
global regularStartLine, errorStartLine, runLine, FilterForTestcase global regularStartLine, errorStartLine, runLine, FilterForTestcase, filterTestList
errorName = "" errorName = ""
m = regularStartLine.match(line) m = regularStartLine.match(line)
@ -337,7 +343,7 @@ def matchStartLine(line, filename):
sys.exit(1) sys.exit(1)
# if we match for filters, only output these! # if we match for filters, only output these!
if ((FilterForTestcase != None) and not FilterForTestcase.match(name)): if ((FilterForTestcase != None) and not FilterForTestcase.match(name)):
print >> sys.stderr, "filtering test case %s" %name filterTestList.append(name)
return("", STATE_BEGIN); return("", STATE_BEGIN);
return (name, STATE_ARANGOSH_OUTPUT) return (name, STATE_ARANGOSH_OUTPUT)
@ -354,7 +360,7 @@ def matchStartLine(line, filename):
# if we match for filters, only output these! # if we match for filters, only output these!
if ((FilterForTestcase != None) and not FilterForTestcase.match(name)): if ((FilterForTestcase != None) and not FilterForTestcase.match(name)):
print >> sys.stderr, "filtering test case %s" %name filterTestList.append(name)
return("", STATE_BEGIN); return("", STATE_BEGIN);
ArangoshFiles[name] = True ArangoshFiles[name] = True
@ -677,6 +683,7 @@ def generateTestCases():
### @brief main ### @brief main
################################################################################ ################################################################################
loopDirectories() loopDirectories()
print >> sys.stderr, "filtering test cases %s" %(filterTestList)
generateArangoshHeader() generateArangoshHeader()
generateSetupFunction() generateSetupFunction()