Commit b8df9313 authored by Robert Loehning's avatar Robert Loehning

Squish: Using param instead of global var in checkLastBuild()

Change-Id: I9c7af050f9ff211cd5025fe5421449dcdee04f53
Reviewed-by: default avatarChristian Stenger <christian.stenger@digia.com>
parent ef38ac77
......@@ -29,13 +29,11 @@
import re;
# flag to indicate whether a tasks file should be created when building ends with errors
createTasksFileOnError = True
# this method checks the last build (if there's one) and logs the number of errors, warnings and
# lines within the Issues output
# optional parameter can be used to tell this function if the build was expected to fail or not
def checkLastBuild(expectedToFail=False):
# param expectedToFail can be used to tell this function if the build was expected to fail or not
# param createTasksFileOnError whether a tasks file should be created when building ends with errors
def checkLastBuild(expectedToFail=False, createTasksFileOnError=True):
try:
# can't use waitForObject() 'cause visible is always 0
buildProg = findObject("{type='ProjectExplorer::Internal::BuildProgress' unnamed='1' }")
......
......@@ -98,9 +98,7 @@ def main():
invokeMenuItem('Build', 'Build Project "%s"' % projectName)
waitForCompile(10000)
if not virtualFunctionsAdded:
global createTasksFileOnError
createTasksFileOnError = False
checkLastBuild(True)
checkLastBuild(True, False)
if not openDocument("%s.Headers.%s\.h" % (projectName, className.lower())):
test.fail("Could not open %s.h - continuing." % className.lower())
continue
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment