diff options
Diffstat (limited to 'tests/auto/android/runtests_androiddeployqt.pl')
| -rwxr-xr-x | tests/auto/android/runtests_androiddeployqt.pl | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/tests/auto/android/runtests_androiddeployqt.pl b/tests/auto/android/runtests_androiddeployqt.pl index c949e1cf87..28fe976c50 100755 --- a/tests/auto/android/runtests_androiddeployqt.pl +++ b/tests/auto/android/runtests_androiddeployqt.pl @@ -79,6 +79,7 @@ my $total_failed = 0; my $failed_insignificants = 0; my $ci_use = 0; my $start = time(); +my $uninstall = 0; GetOptions('h|help' => \$help , man => \$man @@ -98,6 +99,7 @@ GetOptions('h|help' => \$help , 'testcase=s' => \$testcase , 'silent' => sub { $silent = 1 } , 'ci' => sub { $ci_use = 1 } + , 'uninstall' => sub { $uninstall = 1 } ) or pod2usage(2); pod2usage(1) if $help; pod2usage(-verbose => 2) if $man; @@ -300,6 +302,7 @@ sub waitForProcess my $src_dir_qt=abs_path(dirname($0)."/../../.."); my $quadruplor_dir="$src_dir_qt/tests/auto/android"; my $qmake_path="$src_dir_qt/bin/qmake"; +my $androiddeployqt_path="$src_dir_qt/bin/androiddeployqt"; my $tests_dir="$src_dir_qt/tests$testsubset"; my $temp_dir=tempdir(CLEANUP => 1); my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime(time); @@ -349,6 +352,7 @@ sub startTest { #killProcess($packageName); print "Someone should kill $packageName\n"; + system("$adb_tool $device_serial uninstall $packageName") if ($uninstall); return 1; } @@ -362,6 +366,7 @@ sub startTest my $insig = print_output("$output_dir/$output_file.txt", $packageName, $insignificance); } + system("$adb_tool $device_serial uninstall $packageName") if ($uninstall); return 1; } @@ -389,9 +394,9 @@ foreach (split("\n",$testsFiles)) print $res if (!$silent); my $application=basename(cwd); if ($silent) { - $cmd="androiddeployqt --install ${deployqt_device_serial} --output ${temp_dir} --deployment debug --verbose --input android-libtst_${application}.so-deployment-settings.json >/dev/null 2>&1"; + $cmd="$androiddeployqt_path --install ${deployqt_device_serial} --output ${temp_dir} --deployment debug --verbose --input android-libtst_${application}.so-deployment-settings.json >/dev/null 2>&1"; } else { - $cmd="androiddeployqt --install ${deployqt_device_serial} --output ${temp_dir} --deployment debug --verbose --input android-libtst_${application}.so-deployment-settings.json"; + $cmd="$androiddeployqt_path --install ${deployqt_device_serial} --output ${temp_dir} --deployment debug --verbose --input android-libtst_${application}.so-deployment-settings.json"; } $res = qx(${cmd}); print $res if (!$silent); @@ -496,6 +501,10 @@ Suppress output of system commands. Enables checking if test is insignificant or not. Also prints test summary after all tests has been executed. +=item B<-uninstall> + +Uninstalls the test after has been executed. + =item B<-h --help> Print a brief help message and exits. |