feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge branch 'master' of ssh://codereview.qt-project.org/qt-creator/qt-creator

Browse Source
This commit is contained in:
Eike Ziller
2012-07-24 14:17:43 +02:00
parent 42f4595e37 bef8f58fe8
commit 10c188d1e4
6 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/system/suite_APTW/shared/aptw.py
View File

@@ -15,7 +15,7 @@ def verifyBuildAndRun():
# pick version 4.7.4 and then run project for debug and release # pick version 4.7.4 and then run project for debug and release
def pickVersion474runVerify(): def pickVersion474runVerify():
availableConfigs = iterateBuildConfigs(1, 0, ".*4.7.4.*") availableConfigs = iterateBuildConfigs(1, 0)
if not availableConfigs: if not availableConfigs:
test.fatal("Haven't found needed Qt version (Qt 4.7.4), quitting") test.fatal("Haven't found needed Qt version (Qt 4.7.4), quitting")
invokeMenuItem("File", "Save All") invokeMenuItem("File", "Save All")

2
tests/system/suite_CCOM/tst_CCOM01/test.py
View File

@@ -14,7 +14,7 @@ def main():
# open example project # open example project
openQmakeProject(examplePath) openQmakeProject(examplePath)
# build and wait until finished - on all (except Qt 4.7.0 (would fail)) build configurations # build and wait until finished - on all (except Qt 4.7.0 (would fail)) build configurations
availableConfigs = iterateBuildConfigs(1, 0, "(?!.*4\.7\.0.*)") availableConfigs = iterateBuildConfigs(1, 0)
if not availableConfigs: if not availableConfigs:
test.fatal("Haven't found a suitable Qt version (anything except Qt 4.7.0) - leaving without building.") test.fatal("Haven't found a suitable Qt version (anything except Qt 4.7.0) - leaving without building.")
for config in availableConfigs: for config in availableConfigs:

2
tests/system/suite_SCOM/tst_SCOM01/test.py
View File

@@ -7,7 +7,7 @@ def main():
# create qt quick application # create qt quick application
createNewQtQuickApplication(tempDir(), "SampleApp") createNewQtQuickApplication(tempDir(), "SampleApp")
# build it - on all (except Qt 4.7.0 (would fail)) build configurations # build it - on all (except Qt 4.7.0 (would fail)) build configurations
availableConfigs = iterateBuildConfigs(1, 0, "(?!.*4\.7\.0.*)") availableConfigs = iterateBuildConfigs(1, 0)
if not availableConfigs: if not availableConfigs:
test.fatal("Haven't found a suitable Qt version (anything except Qt 4.7.0) - leaving without building.") test.fatal("Haven't found a suitable Qt version (anything except Qt 4.7.0) - leaving without building.")
for config in availableConfigs: for config in availableConfigs:

2
tests/system/suite_SCOM/tst_SCOM04/test.py
View File

@@ -17,7 +17,7 @@ def main():
# save all # save all
invokeMenuItem("File", "Save All") invokeMenuItem("File", "Save All")
# build it - on all (except Qt 4.7.0 (would fail)) build configurations # build it - on all (except Qt 4.7.0 (would fail)) build configurations
availableConfigs = iterateBuildConfigs(1, 0, "(?!.*4\.7\.0.*)") availableConfigs = iterateBuildConfigs(1, 0)
if not availableConfigs: if not availableConfigs:
test.fatal("Haven't found a suitable Qt version (anything except Qt 4.7.0) - leaving without building.") test.fatal("Haven't found a suitable Qt version (anything except Qt 4.7.0) - leaving without building.")
for config in availableConfigs: for config in availableConfigs:

2
tests/system/suite_debugger/tst_simple_debug/test.py
View File

@@ -34,7 +34,7 @@ def main():
if result: if result:
expectedBreakpointsOrder = [{"main.cpp":9}, {"main.qml":14}] expectedBreakpointsOrder = [{"main.cpp":9}, {"main.qml":14}]
# Only use 4.7.4 to work around QTBUG-25187 # Only use 4.7.4 to work around QTBUG-25187
availableConfigs = iterateBuildConfigs(1, 0, ".*4\.7\.4.*$(?<![Rr]elease)") availableConfigs = iterateBuildConfigs(1, 0, "Debug")
if not availableConfigs: if not availableConfigs:
test.fatal("Haven't found a suitable Qt version (need Qt 4.7.4) - leaving without debugging.") test.fatal("Haven't found a suitable Qt version (need Qt 4.7.4) - leaving without debugging.")
for config in availableConfigs: for config in availableConfigs:

2
tests/system/suite_general/tst_build_speedcrunch/test.py
View File

@@ -21,7 +21,7 @@ def main():
fancyToolButton = waitForObject(":*Qt Creator_Core::Internal::FancyToolButton") fancyToolButton = waitForObject(":*Qt Creator_Core::Internal::FancyToolButton")
qtVerPattern = re.compile("\d\.\d(\.\d+)?") qtVerPattern = re.compile("\d\.\d(\.\d+)?")
availableConfigs = iterateBuildConfigs(1, 0, "(Desktop )?Qt.*Release") availableConfigs = iterateBuildConfigs(1, 0, "Release")
if not availableConfigs: if not availableConfigs:
test.fatal("Haven't found a suitable Qt version (need Release build) - leaving without building.") test.fatal("Haven't found a suitable Qt version (need Release build) - leaving without building.")
for config in availableConfigs: for config in availableConfigs: