extended to test to check exe. extension removal (#88338#)

3 files changed, 70 insertions, 9 deletions

diff --git a/sal/test/bootstrap b/sal/test/bootstrap
index 98c20494f2b9..6e307417e230 100644
--- a/sal/test/bootstrap
+++ b/sal/test/bootstrap
@@ -3,16 +3,27 @@
 setenv MYBOOTSTRAPTESTVALUE 0
 echo 1
 ./testbootstrap 1 -env:MYBOOTSTRAPTESTVALUE=1
+
 echo 2
-./testbootstrap file
+./testbootstrap.bin file
+
 echo 3
+./testbootstrap.Bin file
+
+echo 4
+./testbootstrap.exe file
+
+echo 5
+./testbootstrap.Exe file
+
+echo 6
 ./testbootstrap 0 -env:INIFILENAME=
 
 unsetenv MYBOOTSTRAPTESTVALUE
-echo 4
+echo 7
 ./testbootstrap default -env:INIFILENAME=
 
-echo 5
+echo 8
 ./testbootstrap default -env:MYBOOTSTRAPTESTVALUE2=1 -env:INIFILENAME=
 
 echo
@@ -20,26 +31,33 @@ echo "macro tests"
 echo
 
 # simple macro expansion
+echo 9
 ./testbootstrap _first_second_third_ -env:FIRST=first -env:SECOND=second -env:THIRD=third -env:MYBOOTSTRAPTESTVALUE='_${FIRST}_${SECOND}_${THIRD}_'
 
 # simple quoting
+echo 10
 ./testbootstrap '_${FIRST}_${SECOND}_${THIRD}_' -env:FIRST=first -env:SECOND=second -env:THIRD=third -env:MYBOOTSTRAPTESTVALUE='_\$\{FIRST\}_\$\{SECOND\}_\$\{THIRD\}_'
 
 # simple ini access
+echo 11
 ./testbootstrap TheKeysValue -env:'MYBOOTSTRAPTESTVALUE=${./bootstraptest.ini:TheSection:TheKey}'
 
 # ini access with simple macro expansion
+echo 12
 ./testbootstrap TheKeysValue -env:ININAME=./bootstraptest.ini -env:SECTIONNAME=TheSection -env:KEYNAME=TheKey \
 	 -env:'MYBOOTSTRAPTESTVALUE=${$ININAME:$SECTIONNAME:$KEYNAME}'
 
 # ini access with complex macro expansion
+echo 13
 ./testbootstrap TheKeysValue -env:ININAME=./bootstraptest.ini \
 	-env:'MYBOOTSTRAPTESTVALUE=${$ININAME:${$ININAME:SecondSection:IndirectSection}:${$ININAME:SecondSection:IndirectKey}}'
 
 # test no infinit recursion
+echo 14
 ./testbootstrap "***RECURSION DETECTED***" -env:'MYBOOTSTRAPTESTVALUE=$MYBOOTSTRAPTESTVALUE'
 
 # test unicode
+echo 15
 ./testbootstrap AAABBBCCC000 -env:'MYBOOTSTRAPTESTVALUE=\u0041\u0041\u0041\u0042\u0042\u0042\u0043\u0043\u0043\u0030\u0030\u0030'
 
 echo
diff --git a/sal/test/bootstrap.bat b/sal/test/bootstrap.bat
index af6554b5a7fa..2d3e9df3ccdf 100755
--- a/sal/test/bootstrap.bat
+++ b/sal/test/bootstrap.bat
@@ -2,17 +2,28 @@
 set MYBOOTSTRAPTESTVALUE=0
 echo 1
 .\testbootstrap 1 -env:MYBOOTSTRAPTESTVALUE=1
+
 echo 2
 .\testbootstrap.exe file
+
 echo 3
-.\testbootstrap 0 -env:INIFILENAME=
+.\testbootstrap.Exe file
 
 echo 4
+.\testbootstrap.bin file
+
+echo 5
+.\testbootstrap.Bin file
+
+echo 6
+.\testbootstrap 0 -env:INIFILENAME=
+
+echo 7
 set MYBOOTSTRAPTESTVALUE=
 rem simply ignore the file ....
 .\testbootstrap default -env:INIFILENAME=
 
-echo 5
+echo 8
 .\testbootstrap default -env:MYBOOTSTRAPTESTVALUE2=1 -env:INIFILENAME=
 
 echo
@@ -20,24 +31,31 @@ echo "macro tests"
 echo
 
 rem simple macro expansion
+echo 9
 .\testbootstrap _first_second_third_ -env:FIRST=first -env:SECOND=second -env:THIRD=third -env:MYBOOTSTRAPTESTVALUE=_${FIRST}_${SECOND}_${THIRD}_
 
 rem simple quoting
+echo 10
 .\testbootstrap _${FIRST}_${SECOND}_${THIRD}_ -env:FIRST=first -env:SECOND=second -env:THIRD=third -env:MYBOOTSTRAPTESTVALUE=_\$\{FIRST\}_\$\{SECOND\}_\$\{THIRD\}_
 
 rem simple ini access
+echo 11
 .\testbootstrap TheKeysValue -env:MYBOOTSTRAPTESTVALUE=${./bootstraptest.ini:TheSection:TheKey}
 
 rem ini access with simple macro expansion
+echo 12
 .\testbootstrap TheKeysValue -env:ININAME=./bootstraptest.ini -env:SECTIONNAME=TheSection -env:KEYNAME=TheKey -env:MYBOOTSTRAPTESTVALUE=${$ININAME:$SECTIONNAME:$KEYNAME}
 
 rem ini access with complex macro expansion
+echo 13
 .\testbootstrap TheKeysValue -env:ININAME=./bootstraptest.ini -env:MYBOOTSTRAPTESTVALUE=${$ININAME:${$ININAME:SecondSection:IndirectSection}:${$ININAME:SecondSection:IndirectKey}}
 
 rem test no infinit recursion
+echo 14
 .\testbootstrap "***RECURSION DETECTED***" -env:MYBOOTSTRAPTESTVALUE=$MYBOOTSTRAPTESTVALUE
 
 rem test unicode
+echo 15
 .\testbootstrap AAABBBCCC000 -env:MYBOOTSTRAPTESTVALUE=\u0041\u0041\u0041\u0042\u0042\u0042\u0043\u0043\u0043\u0030\u0030\u0030
 
 
diff --git a/sal/test/makefile.mk b/sal/test/makefile.mk
index 5b78baa490c4..d01ca52ff1e9 100644
--- a/sal/test/makefile.mk
+++ b/sal/test/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.6 $
+#   $Revision: 1.7 $
 #
-#   last change: $Author: jbu $ $Date: 2001-07-06 09:39:53 $
+#   last change: $Author: kr $ $Date: 2001-07-25 08:18:39 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -107,9 +107,33 @@ APP2STDLIBS = $(SALLIB)
 
 
 # --- Targets ------------------------------------------------------
-
 .IF "$(depend)" == ""
-ALL : $(BIN)$/$(BOOTSTRAPSCRIPT) $(BIN)$/$(BOOTSTRAPINI) $(BIN)$/bootstraptest.ini ALLTAR 
+ALL : ALLTAR \
+      $(BIN)$/$(BOOTSTRAPSCRIPT) \
+      $(BIN)$/$(BOOTSTRAPINI)    \
+      $(BIN)$/bootstraptest.ini  \
+      $(BIN)$/testbootstrap.bin  \
+      $(BIN)$/testbootstrap.Bin  \
+      $(BIN)$/testbootstrap.Exe
+
+
+.IF "$(GUI)"=="UNX"
+ALL:  $(BIN)$/testbootstrap.exe
+
+$(BIN)$/testbootstrap.exe : $(APP2TARGETN)
+    cp $(APP2TARGETN) $@
+
+.ENDIF
+
+$(BIN)$/testbootstrap.bin : $(APP2TARGETN)
+    cp $(APP2TARGETN) $@
+
+$(BIN)$/testbootstrap.Bin : $(APP2TARGETN)
+    cp $(APP2TARGETN) $@
+
+$(BIN)$/testbootstrap.Exe : $(APP2TARGETN)
+    cp $(APP2TARGETN) $@
+
 .ELSE
 ALL: 	ALLDEP
 .ENDIF
@@ -129,6 +153,7 @@ $(BIN)$/$(BOOTSTRAPINI) : testbootstrap.ini
 $(BIN)$/bootstraptest.ini : bootstraptest.ini
     $(MY_SCRIPTCAT) bootstraptest.ini > $@	
 
+
 # --- SO2-Filter-Datei ---
 $(MISC)$/tsl$(UPD)$(DLLPOSTFIX).flt:
     @echo ------------------------------