diff options
| author | Christian Stenger <christian.stenger@digia.com> | 2013-02-22 14:31:39 +0100 |
|---|---|---|
| committer | Christian Stenger <christian.stenger@digia.com> | 2013-02-22 16:52:13 +0100 |
| commit | 86d3e075ffd552f58a000bd32a4ca103acf709a8 (patch) | |
| tree | 1bbe08beef53f1d0ac62f021128866f2fcfbb358 /tests/system/suite_SCOM | |
| parent | 5ceeddf2b8d5a1a4d2438d5eed9320b8c1ced3c2 (diff) | |
| download | qt-creator-86d3e075ffd552f58a000bd32a4ca103acf709a8.tar.gz | |
Squish: catch plugin loader error if it occurs
...and stop execution of the current test case
Change-Id: I46ac21e79f643f6890b7303d08c204dcd9fa9386
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Diffstat (limited to 'tests/system/suite_SCOM')
| -rw-r--r-- | tests/system/suite_SCOM/tst_SCOM01/test.py | 2 | ||||
| -rw-r--r-- | tests/system/suite_SCOM/tst_SCOM02/test.py | 2 | ||||
| -rw-r--r-- | tests/system/suite_SCOM/tst_SCOM04/test.py | 2 | ||||
| -rw-r--r-- | tests/system/suite_SCOM/tst_SCOM05/test.py | 2 |
4 files changed, 8 insertions, 0 deletions
diff --git a/tests/system/suite_SCOM/tst_SCOM01/test.py b/tests/system/suite_SCOM/tst_SCOM01/test.py index b279fc5525..f9281a5824 100644 --- a/tests/system/suite_SCOM/tst_SCOM01/test.py +++ b/tests/system/suite_SCOM/tst_SCOM01/test.py @@ -4,6 +4,8 @@ source("../../shared/suites_qtta.py") # entry of test def main(): startApplication("qtcreator" + SettingsPath) + if not startedWithoutPluginError(): + return # create qt quick application checkedTargets, projectName = createNewQtQuickApplication(tempDir(), "SampleApp") # build it - on all build configurations diff --git a/tests/system/suite_SCOM/tst_SCOM02/test.py b/tests/system/suite_SCOM/tst_SCOM02/test.py index 517217dabd..a08d85d70d 100644 --- a/tests/system/suite_SCOM/tst_SCOM02/test.py +++ b/tests/system/suite_SCOM/tst_SCOM02/test.py @@ -4,6 +4,8 @@ source("../../shared/suites_qtta.py") # entry of test def main(): startApplication("qtcreator" + SettingsPath) + if not startedWithoutPluginError(): + return # create qt quick application createNewQtQuickApplication(tempDir(), "SampleApp") # create syntax error in qml file diff --git a/tests/system/suite_SCOM/tst_SCOM04/test.py b/tests/system/suite_SCOM/tst_SCOM04/test.py index be20b1fd36..d8b649d579 100644 --- a/tests/system/suite_SCOM/tst_SCOM04/test.py +++ b/tests/system/suite_SCOM/tst_SCOM04/test.py @@ -7,6 +7,8 @@ def main(): expectedErrorAlternatives = ["'SyntaxError' was not declared in this scope", "'SyntaxError' : undeclared identifier"] startApplication("qtcreator" + SettingsPath) + if not startedWithoutPluginError(): + return # create qt quick application checkedTargets, projectName = createNewQtQuickApplication(tempDir(), "SampleApp") # create syntax error in cpp file diff --git a/tests/system/suite_SCOM/tst_SCOM05/test.py b/tests/system/suite_SCOM/tst_SCOM05/test.py index b0ed04a73c..5d7ceb7155 100644 --- a/tests/system/suite_SCOM/tst_SCOM05/test.py +++ b/tests/system/suite_SCOM/tst_SCOM05/test.py @@ -26,6 +26,8 @@ def main(): projectName1 = "SampleApp1" projectName2 = "SampleApp2" startApplication("qtcreator" + SettingsPath) + if not startedWithoutPluginError(): + return # create qt quick application 1 createNewQtQuickApplication(tempDir(), projectName1) # create qt quick application 2 |