From f9cac362577be6d40d0a361fdf6ee383dc7812c9 Mon Sep 17 00:00:00 2001
From: Janne Anttila <janne.anttila@digia.com>
Date: Fri, 22 Feb 2013 09:47:48 +0200
Subject: [PATCH] Use make-check.bin instead of make.bin when running
testplanner.pl.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
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>
---
scripts/qt/qtmod_test.pl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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),
);
--
GitLab