diff options
| author | Nikolai Kosjar <nikolai.kosjar@digia.com> | 2013-07-24 11:17:31 +0200 |
|---|---|---|
| committer | Nikolai Kosjar <nikolai.kosjar@digia.com> | 2013-07-25 09:33:17 +0200 |
| commit | 871c9cfd3f5ecab1456057b5615bdda4211dbf71 (patch) | |
| tree | 7710efbfb88827b1b78485b2c09cc5eff01f2f0c /src/app | |
| parent | 196424115338fb9a535810704b7d814d318b0462 (diff) | |
| download | qt-creator-871c9cfd3f5ecab1456057b5615bdda4211dbf71.tar.gz | |
Tests: Fix race condition when executing plugin tests
Usually the plugin tests are executed after the session manager
evaluated the command line arguments. This is just fine for the file and
token tests of the CppEditor (fileandtokenactions_test.cpp) since these
depend on the files and projects passed in via command line.
Running qtcreator within valgrind reverses the sequence and makes it
impossible to execute the mentioned tests. Fixed by starting the tests
after the plugin initialization is done.
Change-Id: I7cc392b7da7e0d98e0ce44edba2e3abceb84fad8
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Diffstat (limited to 'src/app')
| -rw-r--r-- | src/app/main.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/app/main.cpp b/src/app/main.cpp index 3a24d1f608..77d9936648 100644 --- a/src/app/main.cpp +++ b/src/app/main.cpp @@ -511,12 +511,6 @@ int main(int argc, char **argv) // shutdown plugin manager on the exit QObject::connect(&app, SIGNAL(aboutToQuit()), &pluginManager, SLOT(shutdown())); -#ifdef WITH_TESTS - // Do this after the event loop has started - if (PluginManager::testRunRequested()) - QTimer::singleShot(100, &pluginManager, SLOT(startTests())); -#endif - const int r = app.exec(); cleanupCrashHandler(); return r; |