summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Loehning <robert.loehning@digia.com>2014-05-16 13:50:25 +0200
committerRobert Loehning <robert.loehning@digia.com>2014-05-16 15:23:48 +0200
commitb8df93134d55e15b75e4b704fef36d3b6aa8305c (patch)
tree5755381c4fa836db2c63b5a52ae42d5c4b994cce
parentef38ac778c053b05e5c7a0fb88f5272581fd5fe2 (diff)
downloadqt-creator-b8df93134d55e15b75e4b704fef36d3b6aa8305c.tar.gz
Squish: Using param instead of global var in checkLastBuild()
Change-Id: I9c7af050f9ff211cd5025fe5421449dcdee04f53 Reviewed-by: Christian Stenger <christian.stenger@digia.com>
-rw-r--r--tests/system/shared/build_utils.py8
-rw-r--r--tests/system/suite_APTW/tst_APTW03/test.py4
2 files changed, 4 insertions, 8 deletions
diff --git a/tests/system/shared/build_utils.py b/tests/system/shared/build_utils.py
index d01ebd3543..98ed0bdd9a 100644
--- a/tests/system/shared/build_utils.py
+++ b/tests/system/shared/build_utils.py
@@ -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' }")
diff --git a/tests/system/suite_APTW/tst_APTW03/test.py b/tests/system/suite_APTW/tst_APTW03/test.py
index fbc6c6cf63..19cc55ba95 100644
--- a/tests/system/suite_APTW/tst_APTW03/test.py
+++ b/tests/system/suite_APTW/tst_APTW03/test.py
@@ -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