TestCompiler: split commands from arguments

this allows us to temporarily set some extra args without (incorrectly)
instantiating a second TestCompiler (and on the way relying on $PATH for
finding qmake).

Change-Id: Icce5bf7314148ddbe705606f77a26e3362b31f67
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>

1 files changed, 7 insertions, 7 deletions

diff --git a/tests/auto/tools/qmake/tst_qmake.cpp b/tests/auto/tools/qmake/tst_qmake.cpp
index 4da781f763..c01900c26e 100644
--- a/tests/auto/tools/qmake/tst_qmake.cpp
+++ b/tests/auto/tools/qmake/tst_qmake.cpp
@@ -138,6 +138,7 @@ void tst_qmake::init()
 
 void tst_qmake::cleanup()
 {
+    test_compiler.resetArguments();
     test_compiler.clearCommandOutput();
 }
 
@@ -448,31 +449,30 @@ void tst_qmake::bundle_spaces()
 {
     QString workDir = base_path + "/testdata/bundle-spaces";
 
-    // We set up alternate commands here, to make sure we're testing Mac
+    // We set up alternate arguments here, to make sure we're testing Mac
     // Bundles and since this might be the wrong output we rely on dry-running
     // make (-n).
 
-    TestCompiler local_tc;
-    local_tc.setBaseCommands("make -n", "qmake -macx -spec macx-g++");
+    test_compiler.setArguments("-n", "-spec macx-g++");
 
-    QVERIFY( local_tc.qmake(workDir, "bundle-spaces") );
+    QVERIFY( test_compiler.qmake(workDir, "bundle-spaces") );
 
     TempFile non_existing_file(workDir + "/non-existing file");
     QVERIFY( !non_existing_file.exists() );
 
     // Make fails: no rule to make "non-existing file"
-    QVERIFY( !local_tc.make(workDir) );
+    QVERIFY( !test_compiler.make(workDir, QString()) );
 
     QVERIFY( non_existing_file.open(QIODevice::WriteOnly) );
     QVERIFY( non_existing_file.exists() );
 
     // Aha!
-    QVERIFY( local_tc.make(workDir) );
+    QVERIFY( test_compiler.make(workDir) );
 
     // Cleanup
     QVERIFY( non_existing_file.remove() );
     QVERIFY( !non_existing_file.exists() );
-    QVERIFY( local_tc.removeMakefile(workDir) );
+    QVERIFY( test_compiler.removeMakefile(workDir) );
 }
 #endif // Q_OS_WIN