diff options
| author | Oliver Bolte <obo@openoffice.org> | 2009-02-19 11:42:47 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2009-02-19 11:42:47 +0000 |
| commit | 2d23f56e6d8655aae664edf26e9c65e813d74735 (patch) | |
| tree | f4d068777a355a28f6e8fecc3d53d3c31ac7939f /smoketestoo_native | |
| parent | 496932ac14ff86cd28dae1935f38df874d42cc53 (diff) | |
CWS-TOOLING: integrate CWS sb104
2009-01-27 13:09:06 +0100 sb r266986 : #i97992# cws rebase: merged cws/sb104/config_office/set_soenv.in with moved tags/DEV300_m40/set_soenv.in
2009-01-27 10:56:40 +0100 sb r266966 : CWS-TOOLING: rebase CWS sb104 to trunk@266944 (milestone: DEV300:m40)
2009-01-20 14:37:00 +0100 sb r266581 : #i97992# missing treatment of Solaris-only adjustvisibility as build-internal tool
2009-01-20 09:32:38 +0100 sb r266554 : CWS-TOOLING: rebase CWS sb104 to trunk@266428 (milestone: DEV300:m39)
2009-01-14 13:40:45 +0100 sb r266296 : #i97992# do not pass comment lines to shell
2009-01-14 12:50:34 +0100 sb r266290 : #i97992# avoid problems with checkdll not finding AWTLIB and its dependents
2009-01-14 12:49:20 +0100 sb r266289 : #i97992# on Linux and Solaris, regxpcom apparently needs to be called with the libxpcom.so directory on the LD_LIBRARY_PATH
2009-01-13 09:41:37 +0100 sb r266196 : #i97992# fixed AUGMENT_LIBRARY_PATH definitions
2009-01-12 18:02:03 +0100 sb r266177 : #i97992# get rid of LD_LIBRARY_PATH in build environment
Diffstat (limited to 'smoketestoo_native')
| -rwxr-xr-x | smoketestoo_native/smoketest.pl | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/smoketestoo_native/smoketest.pl b/smoketestoo_native/smoketest.pl index c10ed72fd907..c37c9d4949ed 100755 --- a/smoketestoo_native/smoketest.pl +++ b/smoketestoo_native/smoketest.pl @@ -496,12 +496,6 @@ sub doTest { print "starting office ($INSTSETNAME)\n"; - if ($gui eq "UNX") { - delete $ENV{LD_LIBRARY_PATH}; - } - if ($ENV{OS} eq "MACOSX") { - delete $ENV{DYLD_LIBRARY_PATH}; - } $Command = "\"$programpath" . "$SOFFICEBIN\" -norestore -nocrashreport macro:///Standard.Global.StartTestWithDefaultOptions"; if ( (defined($ENV{OS})) && ($ENV{OS} eq "MACOSX") ) { $Command = "cd \"$programpath\"; " . $Command; @@ -610,7 +604,12 @@ sub doInstall { my $instoo_dir = "$ENV{SOLARROOT}/instsetoo_native"; if ( $ENV{'SYSTEM_MOZILLA'} eq 'YES' ) { - $ENV{'LD_LIBRARY_PATH'} = "$ENV{'MOZ_LIB'}:$ENV{'LD_LIBRARY_PATH'}"; + if (defined $ENV{'LD_LIBRARY_PATH'}) { + $ENV{'LD_LIBRARY_PATH'} = + "$ENV{'LD_LIBRARY_PATH'}:$ENV{'MOZ_LIB'}"; + } else { + $ENV{'LD_LIBRARY_PATH'} = $ENV{'MOZ_LIB'}; + } } $ENV{'PYTHONPATH'} = "$ENV{SOLARROOT}/instsetoo_native/$ENV{INPATH}/bin:$ENV{SOLARVERSION}/$ENV{INPATH}/lib"; $ENV{OUT} = "../$ENV{INPATH}"; |