diff options
| author | Tor Lillqvist <tml@iki.fi> | 2012-12-12 01:07:09 +0200 |
|---|---|---|
| committer | Peter Foley <pefoley2@verizon.net> | 2012-12-25 17:53:25 +0000 |
| commit | c29098917a1118d4b435df2b5f542adc8505e123 (patch) | |
| tree | f9407e3cf21b49abb40d536f73364abbddcb5ea3 /sal/test | |
| parent | fix officebean on mingw (diff) | |
| download | core-c29098917a1118d4b435df2b5f542adc8505e123.tar.gz core-c29098917a1118d4b435df2b5f542adc8505e123.zip | |
Get rid of (most uses of) GUI
GUI only takes values UNX or WNT, so it is fairly pointless. One can check
whether OS is WNT or not instead.
Change-Id: I78ae32c03536a496a563e5deeb0fca78aebf9c34
Reviewed-on: https://gerrit.libreoffice.org/1304
Reviewed-by: Peter Foley <pefoley2@verizon.net>
Tested-by: Peter Foley <pefoley2@verizon.net>
Diffstat (limited to 'sal/test')
| -rw-r--r-- | sal/test/bootstrap.pl | 16 | ||||
| -rw-r--r-- | sal/test/makefile.mk | 6 |
2 files changed, 11 insertions, 11 deletions
diff --git a/sal/test/bootstrap.pl b/sal/test/bootstrap.pl index c5bf519fefee..7ef389d99747 100644 --- a/sal/test/bootstrap.pl +++ b/sal/test/bootstrap.pl @@ -64,7 +64,7 @@ if (!$rc) { $state = 0; } -if ($ENV{GUI} eq "WNT") { +if ($ENV{OS} eq "WNT") { $rc = system "./testbootstrap", "auxaux", "-env:iniName=ini.ini", '-env:MYBOOTSTRAPTESTVALUE=$CUSTOMINIVALUE'; } else { @@ -75,7 +75,7 @@ if (!$rc) { $state = 0; } -if ($ENV{GUI} eq "WNT") { +if ($ENV{OS} eq "WNT") { $comment = $comment . '$SYSUSERHOME not testable under windows' . "\n"; } else { @@ -86,7 +86,7 @@ else { } } -if ($ENV{GUI} eq "WNT") { +if ($ENV{OS} eq "WNT") { $comment = $comment . '$SYSUSERCONFIG' . " not testable under windows\n"; } else { @@ -97,7 +97,7 @@ else { } } -if ($ENV{GUI} eq "WNT") { +if ($ENV{OS} eq "WNT") { $comment = $comment . '$SYSBINDIR' . " not testable under windows\n"; } else { @@ -108,7 +108,7 @@ else { } } -if ($ENV{GUI} eq "WNT") { +if ($ENV{OS} eq "WNT") { $rc = system "./testbootstrap", "inherited_value", '-env:MYBOOTSTRAPTESTVALUE=$INHERITED_VALUE', "-env:iniName=ini.ini"; } else { @@ -119,7 +119,7 @@ if (!$rc) { $state = 0; } -if ($ENV{GUI} eq "WNT") { +if ($ENV{OS} eq "WNT") { $rc = system "./testbootstrap", "not_overwritten", '-env:MYBOOTSTRAPTESTVALUE=$INHERITED_OVERWRITTEN_VALUE', "-env:iniName=ini.ini"; } else { @@ -137,7 +137,7 @@ if (!$rc) { $state = 0; } -if ($ENV{GUI} eq "WNT") { +if ($ENV{OS} eq "WNT") { $rc = system "./testbootstrap", "defaultValue", "-env:iniName=default.ini", "-env:INIFILENAME=", "-env:USEDEFAULT=1"; } else { @@ -213,7 +213,7 @@ if (!$rc) { } # test no infinit recursion -if ($ENV{GUI} eq "WNT") { +if ($ENV{OS} eq "WNT") { $rc = system "./testbootstrap", '"***RECURSION DETECTED***"', '-env:MYBOOTSTRAPTESTVALUE=$MYBOOTSTRAPTESTVALUE'; diff --git a/sal/test/makefile.mk b/sal/test/makefile.mk index 94709bad3e6b..25aa5dd5fa17 100644 --- a/sal/test/makefile.mk +++ b/sal/test/makefile.mk @@ -33,7 +33,7 @@ CXXFLAGS+= $(LFS_CFLAGS) # ------------------------------------------------------------------ -.IF "$(GUI)"=="WNT" +.IF "$(OS)"=="WNT" BOOTSTRAPSCRIPT=bootstrap.bat BOOTSTRAPINI=testbootstrap.ini MY_SCRIPTCAT=cat @@ -73,7 +73,7 @@ ALL : ALLTAR \ $(BIN)$/bootstrap.pl -.IF "$(GUI)"=="UNX" +.IF "$(OS)"!="WNT" ALL: $(BIN)$/$(APP2TARGET).exe \ $(BIN)$/inirc \ $(BIN)$/defaultrc @@ -124,7 +124,7 @@ ALL: ALLDEP $(BIN)$/$(BOOTSTRAPSCRIPT) : $(BOOTSTRAPSCRIPT) $(MY_SCRIPTCAT) $(BOOTSTRAPSCRIPT) > $@ -.IF "$(GUI)"!="WNT" +.IF "$(OS)"!="WNT" chmod ug+x $@ .ENDIF |