diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2009-05-18 14:16:16 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2009-05-18 14:16:16 +0000 |
| commit | df6dda9837c7a97c2ae465e7b638ae97598664ee (patch) | |
| tree | 94b680f2f8babb4784d41a7283948e3c6dbae29b /smoketestoo_native | |
| parent | 6064b53afc9390973862e7ecfbeb10fb314852a6 (diff) | |
CWS-TOOLING: integrate CWS smoketest22
2009-05-18 15:25:11 +0200 ihi r272027 : l10n fix
2009-05-13 16:50:47 +0200 kz r271864 : #i101889# adjust installpath
Diffstat (limited to 'smoketestoo_native')
| -rwxr-xr-x | smoketestoo_native/smoketest.pl | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/smoketestoo_native/smoketest.pl b/smoketestoo_native/smoketest.pl index 89cdad54b8b0..ee41af6989b4 100755 --- a/smoketestoo_native/smoketest.pl +++ b/smoketestoo_native/smoketest.pl @@ -117,6 +117,7 @@ if ($gui eq "WNT") { $bootstrapini = "bootstrap.ini"; $bootstrapiniTemp = $bootstrapini . "_"; $packpackage = "msi"; + $installpath_without =~ s/\//\\/g; } elsif ($gui eq "UNX") { $is_do_deinstall = 0; @@ -166,6 +167,7 @@ elsif ($gui eq $cygwin) { $WinLineends = "\r\n"; &SetWinLineends(); $packpackage = "msi"; + $installpath_without =~ s/\\/\//g; } else { print_error ("not supported system\n",1); @@ -238,12 +240,6 @@ $WORK_STAMP_LC=$ENV{WORK_STAMP}; $WORK_STAMP_LC =~ tr/A-Z/a-z/; $ENV{DBGSV_INIT} = $DATA . "dbgsv.ini"; $ExtensionDir = $ENV{DMAKE_WORK_DIR} . $PathSeparator . $ENV{OUTPATH} . $ENV{PROEXT} . $PathSeparator . "bin" . $PathSeparator; -if (defined($ENV{INSTALLPATH_SMOKETEST})) { - $installpath_without = $ENV{INSTALLPATH_SMOKETEST}; -} -else { - $installpath_without = $temp_path; -} if (defined($vcsid)) { $installpath_without .= $PathSeparator . $vcsid; |