diff options
| author | Kurt Zenker <kz@openoffice.org> | 2009-06-03 08:13:57 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2009-06-03 08:13:57 +0000 |
| commit | 56b10b275a39aa02b6184deee5d507d578acc274 (patch) | |
| tree | 24e8a42a56dfb9e3569a77c2186e1d2ca0def48b /smoketestoo_native | |
| parent | 9490afc1ec282ac768c3cb128cfbbf2ac620d523 (diff) | |
CWS-TOOLING: integrate CWS sysui37
2009-05-19 12:44:43 +0200 ihi r272072 : #i101914# rpm installer fix
2009-05-18 19:08:13 +0200 ihi r272047 : #i98650# rpm rebuild issue
2009-05-18 16:52:13 +0200 ihi r272036 : #i101916# rpm fix
2009-05-18 16:39:55 +0200 ihi r272035 : #i101914# sysui rpm fix
Diffstat (limited to 'smoketestoo_native')
| -rwxr-xr-x | smoketestoo_native/smoketest.pl | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/smoketestoo_native/smoketest.pl b/smoketestoo_native/smoketest.pl index ee41af6989b4..f1ee21b65b28 100755 --- a/smoketestoo_native/smoketest.pl +++ b/smoketestoo_native/smoketest.pl @@ -47,7 +47,7 @@ use Getopt::Long; # # ######################### $is_debug = 0; # run without executing commands -$is_command_infos = 0; # print command details before exec +$is_command_infos = 1; # print command details before exec $is_protocol_test = 0; $is_remove_on_error = 0; $is_remove_at_end = 1; @@ -677,7 +677,16 @@ sub doInstall { $rpmdir = "$dest_installdir" . "rpm" . $PathSeparator; createPath ($optdir, $error_setup); createPath ($rpmdir, $error_setup); - $Command = "rpm --initdb --dbpath $rpmdir"; + my $ld_library_backup = $ENV{LD_LIBRARY_PATH}; + if ( defined $ENV{SYSBASE}) { + my $sysbase=$ENV{SYSBASE}; + if ( "$ld_library_backup" eq "" ) { + $ENV{LD_LIBRARY_PATH} = "$sysbase/usr/lib"; + } else { + $ENV{LD_LIBRARY_PATH} = "$ld_library_backup:$sysbase/lib"; + } + } + $Command = "rpm --initdb --define \"_dbpath $rpmdir\""; execute_Command ($Command, $error_setup, $show_Message, $command_withoutOutput); $mask = "\\.rpm\$"; getSubFiles ("$installsetpath", \@DirArray, $mask); @@ -688,9 +697,10 @@ sub doInstall { if ( ($file =~ /-menus-/) or ($file =~ /^adabas/) or (/^j2re-/) or ($file =~ /-gnome-/) ) { next; } - $Command = "rpm --install --ignoresize --nodeps -vh --relocate /opt=${dest_installdir}opt --dbpath $rpmdir $installsetpath$file"; + $Command = "rpm --define \"_dbpath $rpmdir\" --install --ignoresize --nodeps -vh --relocate /opt=${dest_installdir}opt $installsetpath$file"; execute_Command ($Command, $error_setup, $show_Message, $command_withoutErrorcheck | $command_withoutOutput); } + $ENV{LD_LIBRARY_PATH}=$ld_library_backup; } } elsif ( (defined($system)) && ($system eq "SunOS") ) { |