Don't run qmake test that requires macx makespec on non Mac OS platforms

And update test to use the clang makespec now that it's the default.

Change-Id: Ifdd34c4220ad76f60b91fd6ef39d189f0f6525f9
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
This commit is contained in:
Tor Arne Vestbø 2013-02-19 15:57:19 +01:00 committed by The Qt Project
parent 5ebc8d3663
commit 443380d97f

View File

@ -85,8 +85,7 @@ private slots:
void one_space();
void findMocs();
void findDeps();
#ifndef Q_OS_WIN
// Test requires make
#if defined(Q_OS_MAC)
void bundle_spaces();
#endif
void includefunction();
@ -456,7 +455,7 @@ struct TempFile
}
};
#ifndef Q_OS_WIN
#if defined(Q_OS_MAC)
void tst_qmake::bundle_spaces()
{
QString workDir = base_path + "/testdata/bundle-spaces";
@ -465,7 +464,7 @@ void tst_qmake::bundle_spaces()
// Bundles and since this might be the wrong output we rely on dry-running
// make (-n).
test_compiler.setArguments("-n", "-spec macx-g++");
test_compiler.setArguments("-n", "-spec macx-clang");
QVERIFY( test_compiler.qmake(workDir, "bundle-spaces") );
@ -486,7 +485,7 @@ void tst_qmake::bundle_spaces()
QVERIFY( !non_existing_file.exists() );
QVERIFY( test_compiler.removeMakefile(workDir) );
}
#endif // Q_OS_WIN
#endif // defined(Q_OS_MAC)
void tst_qmake::includefunction()
{