diff options
| author | Kay Ramme <kr@openoffice.org> | 2001-10-05 07:00:22 +0000 |
|---|---|---|
| committer | Kay Ramme <kr@openoffice.org> | 2001-10-05 07:00:22 +0000 |
| commit | ce9fe9776288598b0328180f195bfddea0df00d7 (patch) | |
| tree | 06c5754bd16aec3495b8bf549ba920df92fa123c /sal/test | |
| parent | 14994d865a82477b9fdd2f0a41e541a80357b122 (diff) | |
added symbol lookup fallback to application rc (#88338#)
Diffstat (limited to 'sal/test')
| -rwxr-xr-x | sal/test/bootstrap.pl | 27 | ||||
| -rw-r--r-- | sal/test/makefile.mk | 10 | ||||
| -rw-r--r-- | sal/test/testbootstrap.ini | 3 |
3 files changed, 34 insertions, 6 deletions
diff --git a/sal/test/bootstrap.pl b/sal/test/bootstrap.pl index 0bfaeb65d..02b1f1b22 100755 --- a/sal/test/bootstrap.pl +++ b/sal/test/bootstrap.pl @@ -5,9 +5,9 @@ eval 'exec perl -wS $0 ${1+"$@"}' # # $RCSfile: bootstrap.pl,v $ # -# $Revision: 1.1 $ +# $Revision: 1.2 $ # -# last change: $Author: kr $ $Date: 2001-08-30 12:17:44 $ +# last change: $Author: kr $ $Date: 2001-10-05 08:00:22 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -116,6 +116,29 @@ if (!$rc) { $state = 0; } + +if ($ENV{GUI} eq "WNT") { + $rc = system "./testbootstrap", "inherited_value", '-env:MYBOOTSTRAPTESTVALUE=$INHERITED_VALUE', "-env:iniName=ini.ini"; +} +else { + $rc = system "./testbootstrap", "inherited_value", '-env:MYBOOTSTRAPTESTVALUE=$INHERITED_VALUE', "-env:iniName=inirc"; +} +if (!$rc) { + $comment = $comment . "inherited value not passed\n"; + $state = 0; +} + +if ($ENV{GUI} eq "WNT") { + $rc = system "./testbootstrap", "inherited_overwritten_value", '-env:MYBOOTSTRAPTESTVALUE=$INHERITED_OVERWRITTEN_VALUE', "-env:iniName=ini.ini"; +} +else { + $rc = system "./testbootstrap", "inherited_overwritten_value", '-env:MYBOOTSTRAPTESTVALUE=$INHERITED_OVERWRITTEN_VALUE', "-env:iniName=inirc"; +} +if (!$rc) { + $comment = $comment . "inherited overwritten value not passed\n"; + $state = 0; +} + delete $ENV{MYBOOTSTRAPTESTVALUE}; diff --git a/sal/test/makefile.mk b/sal/test/makefile.mk index c35ef8c83..d7d1c1a0f 100644 --- a/sal/test/makefile.mk +++ b/sal/test/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.10 $ +# $Revision: 1.11 $ # -# last change: $Author: jbu $ $Date: 2001-09-26 16:42:06 $ +# last change: $Author: kr $ $Date: 2001-10-05 08:00:22 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -127,14 +127,16 @@ $(BIN)$/$(APP2TARGET).exe : $(APP2TARGETN) cp $(APP2TARGETN) $@ $(BIN)$/inirc: - echo "MYBOOTSTRAPTESTVALUE=auxaux" > $@ + echo "MYBOOTSTRAPTESTVALUE=auxaux" > $@ + echo "INHERITED_OVERWRITTEN_VALUE=inherited_overwritten_value" >> $@ .ELSE ALL: $(BIN)$/ini.ini $(BIN)$/ini.ini: - echo MYBOOTSTRAPTESTVALUE=auxaux > $@ + echo MYBOOTSTRAPTESTVALUE=auxaux > $@ + echo INHERITED_OVERWRITTEN_VALUE=inherited_overwritten_value >> $@ .ENDIF diff --git a/sal/test/testbootstrap.ini b/sal/test/testbootstrap.ini index 3c02875cd..2cf7b667c 100644 --- a/sal/test/testbootstrap.ini +++ b/sal/test/testbootstrap.ini @@ -1 +1,4 @@ MYBOOTSTRAPTESTVALUE=file +INHERITED_VALUE=inherited_value +INHERITED_OVERWRITTEN_VALUE=not_overwritten + |