diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-06-13 12:44:46 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-06-13 12:44:46 +0000 |
| commit | 71210746f1c2e33174369d54c91dfe07ab39399b (patch) | |
| tree | 03db6ecd510371a1c6e07a26fd494003c7f98a25 /smoketestoo_native | |
| parent | a899bfe256b00db56164bdfdda4c55308868dfc4 (diff) | |
INTEGRATION: CWS smoketest20 (1.33.8); FILE MERGED
2008/06/05 15:41:08 kz 1.33.8.1: #i90405# remove statjars
Diffstat (limited to 'smoketestoo_native')
| -rwxr-xr-x | smoketestoo_native/smoketest.pl | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/smoketestoo_native/smoketest.pl b/smoketestoo_native/smoketest.pl index acebabfdfd8b..3b05c07b0d1e 100755 --- a/smoketestoo_native/smoketest.pl +++ b/smoketestoo_native/smoketest.pl @@ -11,7 +11,7 @@ eval 'exec perl -wS $0 ${1+"$@"}' # # $RCSfile: smoketest.pl,v $ # -# $Revision: 1.33 $ +# $Revision: 1.34 $ # # This file is part of OpenOffice.org. # @@ -51,7 +51,6 @@ $is_command_infos = 0; # print command details before exec $is_protocol_test = 0; $is_remove_on_error = 0; $is_remove_at_end = 1; -$is_do_statistics = 0; $is_do_deinstall = 0; $is_admin_installation = 1; $is_oo = 1; @@ -261,7 +260,7 @@ if ( $ARGV[0] ) { ( $script_name = $0 ) =~ s/^.*\b(\w+)\.pl$/$1/; -$id_str = ' $Revision: 1.33 $ '; +$id_str = ' $Revision: 1.34 $ '; $id_str =~ /Revision:\s+(\S+)\s+\$/ ? ($script_rev = $1) : ($script_rev = "-"); @@ -499,18 +498,11 @@ sub doTest { if ($ENV{OS} eq "MACOSX") { delete $ENV{DYLD_LIBRARY_PATH}; } - if ((defined($ENV{OS})) && (defined($ENV{PROEXT})) && ($ENV{OS} eq "LINUX") && ($ENV{PROEXT} eq ".pro") && $is_do_statistics) { - print "collecting statistic...\n"; - $Command = "$PERL stats.pl -p=\"$programpath" . "$SOFFICEBIN\" -norestore -nocrashreport macro:///Standard.Global.StartTestWithDefaultOptions"; - execute_Command ($Command, $error_startOffice, $show_Message, $command_normal); - } - else { - $Command = "\"$programpath" . "$SOFFICEBIN\" -norestore -nocrashreport macro:///Standard.Global.StartTestWithDefaultOptions"; - if ( (defined($ENV{OS})) && ($ENV{OS} eq "MACOSX") ) { - $Command = "cd \"$programpath\"; " . $Command; - } - execute_Command ($Command, $error_startOffice, $show_Message, $command_normal); + $Command = "\"$programpath" . "$SOFFICEBIN\" -norestore -nocrashreport macro:///Standard.Global.StartTestWithDefaultOptions"; + if ( (defined($ENV{OS})) && ($ENV{OS} eq "MACOSX") ) { + $Command = "cd \"$programpath\"; " . $Command; } + execute_Command ($Command, $error_startOffice, $show_Message, $command_normal); # test if smoketest is ok (error 5) |