qtmod_test.pl: don't replace `jom' with `nmake' for default make check

This seemed like a good idea at the time, but in fact it is unsafe,
because the user may have specified some arguments in make.args which
can be understood by jom but not understood by nmake (in particular,
-j).

Trying to do anything clever here will probably be counter-productive.
Just leave it to the caller to specify the correct make-check values.

Change-Id: I107e2664ee5530221cf0a0f47d51e0afab34ca43
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>

1 files changed, 2 insertions, 13 deletions

diff --git a/scripts/qt/qtmod_test.pl b/scripts/qt/qtmod_test.pl
index 5b20a578..010b9bae 100755
--- a/scripts/qt/qtmod_test.pl
+++ b/scripts/qt/qtmod_test.pl
@@ -175,8 +175,7 @@ my @PROPERTIES = (
     q{make.args}               => q{extra arguments passed to `make' command (e.g. `-j25')},
 
     q{make-check.bin}          => q{`make' command used for running `make check' (e.g. `make', }
-                                . q{`nmake', `jom'); usually defaults to the value of make.bin, }
-                                . q{but may differ on certain platforms},
+                                . q{`nmake', `jom'); defaults to the value of make.bin},
 
     q{make-check.args}         => q{extra arguments passed to `make check' command when running }
                                 . q{tests (e.g. `-j2'); defaults to the value of make.args with }
@@ -300,17 +299,7 @@ sub default_qt_tests_args
 sub default_make_check_bin
 {
     my ($self) = @_;
-
-    my $make_bin = $self->{ 'make.bin' };
-
-    # If make.bin is jom, switch to nmake instead for the autotests, because
-    # jom 0.9.3 does not handle -k correctly, and there is anyway no advantage
-    # to using jom if running tests one at a time.
-    if ($make_bin eq 'jom') {
-        $make_bin = 'nmake';
-    }
-
-    return $make_bin;
+    return $self->{ 'make.bin' };
 }
 
 sub default_make_check_args