move resetEnvironment() call to cleanup()

we want to call it even if the test fails

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

diff --git a/tests/auto/tools/qmake/tst_qmake.cpp b/tests/auto/tools/qmake/tst_qmake.cpp
index f6d88ff..4db09c6 100644 (file)
--- a/tests/auto/tools/qmake/tst_qmake.cpp
+++ b/tests/auto/tools/qmake/tst_qmake.cpp
@@ -139,6 +139,7 @@ void tst_qmake::init()
 void tst_qmake::cleanup()
 {
     test_compiler.resetArguments();
+    test_compiler.resetEnvironment();
     test_compiler.clearCommandOutput();
 }
 
@@ -306,7 +307,6 @@ void tst_qmake::export_across_file_boundaries()
     test_compiler.addToEnvironment("QMAKEFEATURES=.");
     QString workDir = base_path + "/testdata/export_across_file_boundaries";
     QVERIFY( test_compiler.qmake( workDir, "foo" ));
-    test_compiler.resetEnvironment();
 }
 
 void tst_qmake::include_dir()