[ooo-build-commit] Branch 'ooo/master' - smoketestoo_native/smoketest.pl

[Jan Holesovsky]

 smoketestoo_native/smoketest.pl |   18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

New commits:
commit 181a6daa32357a2e46a5264331f156df9268d48b
Author: Kurt Zenker <kz at openoffice.org>
Date:   Wed Jun 3 08:13:57 2009 +0000

    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

diff --git a/smoketestoo_native/smoketest.pl b/smoketestoo_native/smoketest.pl
index 2c1eb99..fe81c96 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") ) {