diff options
| author | Janne Anttila <janne.anttila@digia.com> | 2013-02-22 09:47:48 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-02-27 07:05:07 +0100 |
| commit | f9cac362577be6d40d0a361fdf6ee383dc7812c9 (patch) | |
| tree | 0a25d283e8feaa4318dec74046f572de9a66a809 /scripts/qt | |
| parent | 06cbb651a6bd33978d2104423b5f88f819197bfa (diff) | |
Use make-check.bin instead of make.bin when running testplanner.pl.
Running testplanner.pl with jom fails with error: "testplan generation
failed". Since we want to use jom for building Qt libraries, changed
testplan generation to use make-check.bin which is always the actual
make i.e. nmake/mingw32-make on Windows.
Change-Id: I9f4efe7d63d5c211f1dd98a7a3832c51cb4cd4b3
Reviewed-by: Simo Fält <simo.falt@digia.com>
Reviewed-by: Samuli Piippo <samuli.piippo@digia.com>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@digia.com>
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
Diffstat (limited to 'scripts/qt')
| -rwxr-xr-x | scripts/qt/qtmod_test.pl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/qt/qtmod_test.pl b/scripts/qt/qtmod_test.pl index f14a4d47..d2353213 100755 --- a/scripts/qt/qtmod_test.pl +++ b/scripts/qt/qtmod_test.pl @@ -1388,7 +1388,7 @@ sub _run_autotests_impl '--output', 'testplan.txt', '--make', - $make_bin, + $make_check_bin, '--', split(/ /, $qt_tests_args), ); |