mirror of https://gitee.com/bigwinds/arangodb
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
This commit is contained in:
commit
0a04083442
|
@ -295,8 +295,8 @@ allErrors = err;
|
|||
################################################################################
|
||||
### @brief Try to match the start of a command section
|
||||
################################################################################
|
||||
regularStartLine = re.compile(r'^(/// )?@EXAMPLE_ARANGOSH_OUTPUT{([^}]*)}')
|
||||
runLine = re.compile(r'^(/// )?@EXAMPLE_ARANGOSH_RUN{([^}]*)}')
|
||||
regularStartLine = re.compile(r'^(/// )? *@EXAMPLE_ARANGOSH_OUTPUT{([^}]*)}')
|
||||
runLine = re.compile(r'^(/// )? *@EXAMPLE_ARANGOSH_RUN{([^}]*)}')
|
||||
|
||||
def matchStartLine(line, filename):
|
||||
global regularStartLine, errorStartLine, runLine, FilterForTestcase
|
||||
|
@ -342,7 +342,7 @@ def matchStartLine(line, filename):
|
|||
# Not found, remain in STATE_BEGIN
|
||||
return ("", STATE_BEGIN)
|
||||
|
||||
endExample = re.compile(r'^(/// )?@END_EXAMPLE_')
|
||||
endExample = re.compile(r'^(/// )? *@END_EXAMPLE_')
|
||||
#r5 = re.compile(r'^ +')
|
||||
|
||||
################################################################################
|
||||
|
@ -576,7 +576,7 @@ def loopDirectories():
|
|||
if os.path.isdir(filename):
|
||||
for root, dirs, files in os.walk(filename):
|
||||
for file in files:
|
||||
if (file.endswith(".mdpp") or file.endswith(".js") or file.endswith(".cpp")) and not file.endswith("ahuacatl.js"):
|
||||
if (file.endswith(".mdpp") or file.endswith(".js") or file.endswith(".cpp")):
|
||||
filenames.append(os.path.join(root, file))
|
||||
else:
|
||||
filenames.append(filename)
|
||||
|
|
Loading…
Reference in New Issue