Commit cca69446 authored by Kevin Funk's avatar Kevin Funk
Browse files

test_custombuildsystemplugin: Don't segfault

parent 5be0ce2d
...@@ -63,9 +63,7 @@ void TestCustomBuildSystemPlugin::loadSimpleProject() ...@@ -63,9 +63,7 @@ void TestCustomBuildSystemPlugin::loadSimpleProject()
KDevSignalSpy* projectSpy = new KDevSignalSpy( ICore::self()->projectController(), SIGNAL( projectOpened( KDevelop::IProject* ) ) ); KDevSignalSpy* projectSpy = new KDevSignalSpy( ICore::self()->projectController(), SIGNAL( projectOpened( KDevelop::IProject* ) ) );
ICore::self()->projectController()->openProject( projecturl ); ICore::self()->projectController()->openProject( projecturl );
// Wait for the project to be opened // Wait for the project to be opened
if( !projectSpy->wait( 20000 ) ) { QVERIFY(projectSpy->wait(10000));
qFatal("Expected project to be loaded within 20 seconds, but this didn't happen");
}
IProject* project = ICore::self()->projectController()->findProjectByName( "SimpleProject" ); IProject* project = ICore::self()->projectController()->findProjectByName( "SimpleProject" );
QVERIFY( project ); QVERIFY( project );
...@@ -79,9 +77,7 @@ void TestCustomBuildSystemPlugin::buildDirProject() ...@@ -79,9 +77,7 @@ void TestCustomBuildSystemPlugin::buildDirProject()
KDevSignalSpy* projectSpy = new KDevSignalSpy( ICore::self()->projectController(), SIGNAL( projectOpened( KDevelop::IProject* ) ) ); KDevSignalSpy* projectSpy = new KDevSignalSpy( ICore::self()->projectController(), SIGNAL( projectOpened( KDevelop::IProject* ) ) );
ICore::self()->projectController()->openProject( projecturl ); ICore::self()->projectController()->openProject( projecturl );
// Wait for the project to be opened // Wait for the project to be opened
if( !projectSpy->wait( 20000 ) ) { QVERIFY(projectSpy->wait(10000));
qFatal("Expected project to be loaded within 20 seconds, but this didn't happen");
}
IProject* project = ICore::self()->projectController()->findProjectByName( "BuilddirProject" ); IProject* project = ICore::self()->projectController()->findProjectByName( "BuilddirProject" );
QVERIFY( project ); QVERIFY( project );
...@@ -97,9 +93,7 @@ void TestCustomBuildSystemPlugin::loadMultiPathProject() ...@@ -97,9 +93,7 @@ void TestCustomBuildSystemPlugin::loadMultiPathProject()
KDevSignalSpy* projectSpy = new KDevSignalSpy( ICore::self()->projectController(), SIGNAL( projectOpened( KDevelop::IProject* ) ) ); KDevSignalSpy* projectSpy = new KDevSignalSpy( ICore::self()->projectController(), SIGNAL( projectOpened( KDevelop::IProject* ) ) );
ICore::self()->projectController()->openProject( projecturl ); ICore::self()->projectController()->openProject( projecturl );
// Wait for the project to be opened // Wait for the project to be opened
if( !projectSpy->wait( 20000 ) ) { QVERIFY(projectSpy->wait(10000));
qFatal("Expected project to be loaded within 20 seconds, but this didn't happen");
}
IProject* project = ICore::self()->projectController()->findProjectByName( "MultiPathProject" ); IProject* project = ICore::self()->projectController()->findProjectByName( "MultiPathProject" );
QVERIFY( project ); QVERIFY( project );
KDevelop::ProjectBaseItem* mainfile = 0; KDevelop::ProjectBaseItem* mainfile = 0;
......
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