diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2013-02-19 15:57:19 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-02-20 00:46:50 +0100 |
| commit | 443380d97f43e81c60377ce9b698756a70c4d1f9 (patch) | |
| tree | b8eeb4d857716c9b0b0dd1ad5f6e064ba3ebb9ab | |
| parent | 5ebc8d3663df5860f13ec9fe0bf4cce1cb37111b (diff) | |
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>
| -rw-r--r-- | tests/auto/tools/qmake/tst_qmake.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/tests/auto/tools/qmake/tst_qmake.cpp b/tests/auto/tools/qmake/tst_qmake.cpp index 186ecd77a4..0935b1bca4 100644 --- a/tests/auto/tools/qmake/tst_qmake.cpp +++ b/tests/auto/tools/qmake/tst_qmake.cpp @@ -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() { |