diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-02-23 15:39:23 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-27 20:52:45 +0100 |
| commit | 0957085f3d5cd6555e1018e480b14982fe604fb7 (patch) | |
| tree | cd585e083a415b718e9ffd60b7c17ae6392b782f /tests | |
| parent | fd1d98b6af09d7cff73c3316097277131d82cd38 (diff) | |
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>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/tools/qmake/tst_qmake.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/tools/qmake/tst_qmake.cpp b/tests/auto/tools/qmake/tst_qmake.cpp index f6d88ffce3..4db09c6c4b 100644 --- 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() |