Removed symlinks / batch files for testrunner and coveragerunner

These links were intended to make these scripts easier to use (e.g.
allow for putting qtqa/bin into $PATH, then just run `testrunner').
However, to the best of my knowledge, nobody has used them in that way,
making the links unnecessary.

Having the links can cause us to generate source packages which are not
able to be extracted on filesystems which don't support symlinks. Since
we don't really need them, just go ahead and remove them.

Task-number: QTBUG-26699
Task-number: QTBUG-26700
Change-Id: I52e56c0c1375cfb43b9b5ab644c559b354979f62
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
Reviewed-by: Caroline Chao <caroline.chao@nokia.com>
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>

1 files changed, 11 insertions, 4 deletions

diff --git a/scripts/qt/qtmod_test.pl b/scripts/qt/qtmod_test.pl
index 39a23f75..82711ef2 100755
--- a/scripts/qt/qtmod_test.pl
+++ b/scripts/qt/qtmod_test.pl
@@ -1130,14 +1130,16 @@ sub get_testrunner_command
 {
     my ($self) = @_;
 
-    my $testrunner = catfile( $FindBin::Bin, '..', '..', 'bin', 'testrunner' );
+    my $testrunner = catfile( $FindBin::Bin, '..', 'generic', 'testrunner.pl' );
     $testrunner    = canonpath abs_path( $testrunner );
 
     # sanity check
     $self->fatal_error( "internal error: $testrunner does not exist" ) if (! -e $testrunner);
 
     my @testrunner_with_args = (
-        $testrunner,
+        $EXECUTABLE_NAME,               # perl
+        $testrunner,                    # testrunner.pl
+        '--',                           # separate perl args from testrunner args
         $self->get_testrunner_args( ),
     );
 
@@ -1461,7 +1463,7 @@ sub run_coverage
     my $qt_gitmodule             = $self->{ 'qt.gitmodule' };
     my $qt_gitmodule_dir         = $self->{ 'qt.gitmodule.dir' };
 
-    my $coveragerunner = catfile( $FindBin::Bin, '..', '..', 'bin', "coveragerunner_$qt_coverage_tool" );
+    my $coveragerunner = catfile( $FindBin::Bin, '..', 'generic', "coveragerunner_$qt_coverage_tool.pl" );
     $coveragerunner    = canonpath abs_path( $coveragerunner );
 
     # sanity check
@@ -1476,7 +1478,12 @@ sub run_coverage
         $qt_coverage_tests_output
     );
 
-    $self->exe($coveragerunner, @coverage_runner_args);
+    $self->exe(
+        $EXECUTABLE_NAME,       # perl
+        $coveragerunner,        # coveragerunner_<foo>.pl
+        '--',                   # separate perl args from other args
+        @coverage_runner_args
+    );
 
     return;
 }