summaryrefslogtreecommitdiff
path: root/smoketestoo_native
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2009-10-14 17:49:00 +0000
committerKurt Zenker <kz@openoffice.org>2009-10-14 17:49:00 +0000
commit3179b731abf5f51ee2edbca9200eeb1e0d3e57ab (patch)
tree368d7f31f7f769c2c19d5d0ab0c3e11117b64b1f /smoketestoo_native
parentf63565c0b51a62a3d972f9ecd98b9911776e8eb1 (diff)
CWS-TOOLING: integrate CWS rpm4lngx
2009-10-06 14:38:50 +0200 vg r276703 : #160779# new environment for unxlngx6
Diffstat (limited to 'smoketestoo_native')
-rwxr-xr-xsmoketestoo_native/smoketest.pl4
1 files changed, 3 insertions, 1 deletions
diff --git a/smoketestoo_native/smoketest.pl b/smoketestoo_native/smoketest.pl
index 325acd2b233b..8ee0b9efcf44 100755
--- a/smoketestoo_native/smoketest.pl
+++ b/smoketestoo_native/smoketest.pl
@@ -702,7 +702,9 @@ sub doInstall {
if ( ($file =~ /-menus-/) or ($file =~ /^adabas/) or (/^j2re-/) or ($file =~ /-gnome-/) ) {
next;
}
- $Command = "rpm --define \"_dbpath $rpmdir\" --install --ignoresize --nodeps -vh --relocate /opt=${dest_installdir}opt $installsetpath$file";
+ $Command = "rpm ";
+ $Command .= "--ignorearch " if (defined $ENV{HOSTTYPE} && ($ENV{HOSTTYPE} eq 'x86_64-linux'));
+ $Command .= "--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;