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 /testtools | |
| parent | e5ccda4bb32eef8cab99c4d43c1571ec4bad3980 (diff) | |
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 'testtools')
| -rw-r--r-- | testtools/qa/cli/makefile.mk | 2 | ||||
| -rw-r--r-- | testtools/source/bridgetest/pyuno/makefile.mk | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/testtools/qa/cli/makefile.mk b/testtools/qa/cli/makefile.mk index 1b56ff7ed301..13ee0bb96380 100644 --- a/testtools/qa/cli/makefile.mk +++ b/testtools/qa/cli/makefile.mk @@ -67,7 +67,7 @@ CT_NOOFFICE = -NoOffice # --- Targets ------------------------------------------------------ RUN: -.IF "$(GUI)"=="WNT" +.IF "$(OS)"=="WNT" java -cp $(CLASSPATH) -Dcli_test=$(EXETARGET) -Dcli_test_arg=$(EXEARG) $(CT_APP) $(CT_NOOFFICE) $(CT_TESTBASE) $(CT_TEST) .ENDIF run: RUN diff --git a/testtools/source/bridgetest/pyuno/makefile.mk b/testtools/source/bridgetest/pyuno/makefile.mk index 46b708e1d0d6..5dbd0038f009 100644 --- a/testtools/source/bridgetest/pyuno/makefile.mk +++ b/testtools/source/bridgetest/pyuno/makefile.mk @@ -48,22 +48,22 @@ PYTHON=$(AUGMENT_LIBRARY_PATH) $(WRAPCMD) $(SOLARBINDIR)/python .ELSE # "$(SYSTEM_PYTHON)"!="YES" PYTHON=$(AUGMENT_LIBRARY_PATH) $(WRAPCMD) python .ENDIF # "$(SYSTEM_PYTHON)"!="YES" -.IF "$(GUI)"=="WNT" +.IF "$(OS)"=="WNT" PYTHONPATH:=$(SOLARLIBDIR)$/pyuno;$(PWD);$(SOLARLIBDIR);$(SOLARLIBDIR)$/python;$(SOLARLIBDIR)$/python$/lib-dynload -.ELSE # "$(GUI)"=="WNT" +.ELSE # "$(OS)"=="WNT" PYTHONPATH:=$(SOLARLIBDIR)$/pyuno:$(PWD):$(SOLARLIBDIR):$(SOLARLIBDIR)$/python:$(SOLARLIBDIR)$/python$/lib-dynload -.ENDIF # "$(GUI)"=="WNT" +.ENDIF # "$(OS)"=="WNT" .EXPORT: PYTHONPATH -.IF "$(GUI)"!="WNT" +.IF "$(OS)"!="WNT" TEST_ENV=export FOO=file://$(shell @pwd)$/$(DLLDEST) \ UNO_TYPES=uno_types.rdb UNO_SERVICES=pyuno_services.rdb -.ELSE # "$(GUI)" != "WNT" +.ELSE # "$(OS)" != "WNT" # aaaaaa, how to get the current working directory on windows ??? CWD_TMP=$(strip $(shell @echo "import os;print os.getcwd()" | $(PYTHON))) TEST_ENV=export FOO=file:///$(strip $(subst,\,/ $(CWD_TMP)$/$(DLLDEST))) && \ export UNO_TYPES=uno_types.rdb && export UNO_SERVICES=pyuno_services.rdb -.ENDIF # "$(GUI)"!="WNT" +.ENDIF # "$(OS)"!="WNT" PYFILES = \ $(DLLDEST)$/core.py \ $(DLLDEST)$/importer.py \ |