diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2012-08-01 11:54:46 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-01 04:32:27 +0200 |
| commit | 1f99fb9240d8b5a78667ad5c3823e557866a05cd (patch) | |
| tree | c66a11bd7fe7f018129e0fc5b14e1c0b06a62c15 /scripts/qt | |
| parent | 3f916db0adc6d6739913ac38d4c682c8742be8a6 (diff) | |
qtmod_test.pl: fixed incorrect usage of '--' in testrunner.pl invoke
This regression was introduced by
4c50b466be676b3b84ddc205d158b1115b0cd3d5. It is necessary to use a
-- to end the perl arguments when perl is invoked with -e, but not when
a file is being run.
The extra -- would result in errors of the form:
QtQA::App::TestRunner: --timeout: No such file or directory
The bug is encountered only when not using the testscheduler.pl script,
which means the bug affected Qt4 but not Qt5.
Change-Id: If5f8e0031982df08176a8d829a050515a79ef59e
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
Diffstat (limited to 'scripts/qt')
| -rwxr-xr-x | scripts/qt/qtmod_test.pl | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/scripts/qt/qtmod_test.pl b/scripts/qt/qtmod_test.pl index e575d6b8..b6d1b2e0 100755 --- a/scripts/qt/qtmod_test.pl +++ b/scripts/qt/qtmod_test.pl @@ -1097,7 +1097,6 @@ sub get_testrunner_command my @testrunner_with_args = ( $EXECUTABLE_NAME, # perl $testrunner, # testrunner.pl - '--', # separate perl args from testrunner args $self->get_testrunner_args( ), ); @@ -1439,7 +1438,6 @@ sub run_coverage $self->exe( $EXECUTABLE_NAME, # perl $coveragerunner, # coveragerunner_<foo>.pl - '--', # separate perl args from other args @coverage_runner_args ); |