sb118: moved test OOo installation stuff to new solenv/inc/installationtest.mk (makefile parts) and new test module (C++ and, new, Java unit test parts); adapted sw/qa/unoapi to new (Java) test framework

1 files changed, 5 insertions, 66 deletions

diff --git a/smoketestoo_native/makefile.mk b/smoketestoo_native/makefile.mk
index bd0bbd8e20d1..0947efe36af4 100644
--- a/smoketestoo_native/makefile.mk
+++ b/smoketestoo_native/makefile.mk
@@ -40,79 +40,18 @@ SLOFILES = $(SHL1OBJS)
 SHL1TARGET = smoketest
 SHL1OBJS = $(SLO)/smoketest.obj
 SHL1RPATH = NONE
-SHL1STDLIBS = $(CPPUHELPERLIB) $(CPPULIB) $(CPPUNITLIB) $(SALLIB)
+SHL1STDLIBS = $(CPPUHELPERLIB) $(CPPULIB) $(CPPUNITLIB) $(SALLIB) $(TESTLIB)
 SHL1VERSIONMAP = version.map
 DEF1NAME = $(SHL1TARGET)
 
 .INCLUDE: target.mk
+.INCLUDE: installationtest.mk
 
-.IF "$(OS)" == "WNT"
-my_file = file:///
-.ELSE
-my_file = file://
-.END
+ALLTAR : cpptest
 
-# The following conditional is an approximation of: UPDATER==YES and
-# CWS_WORK_STAMP not set and either SOL_TMP not set or SOLARENV not starting
-# with SOL_TMP:
-.IF "$(UPDATER)" == "YES" && "$(CWS_WORK_STAMP)" == "" && \
-    "$(SOLARENV:s/$(SOL_TMP)//" == "$(SOLARENV)"
-my_instsets = $(shell ls -dt \
-    $(SHIPDRIVE)/$(INPATH)/OpenOffice/archive/$(WORK_STAMP)_$(UPDMINOR)_native_packed-*_$(defaultlangiso).$(BUILD))
-my_instset = $(my_instsets:1)
-.ELSE
-my_instset = \
-    $(SOLARSRC)/instsetoo_native/$(INPATH)/OpenOffice/archive/install/$(defaultlangiso)
-.ENDIF
+cpptest : $(SHL1TARGETN) $(BIN)/smoketestdoc.sxw
 
-.IF "$(OS)" == "MACOSX"
-my_soffice = $(MISC)/installation/opt/OpenOffice.org.app/Contents/MacOS/soffice
-.ELIF "$(OS)" == "WNT"
-my_soffice = \
-    `cat $(MISC)/installation.flag`'/opt/OpenOffice.org 3/program/soffice.exe'
-.ELSE
-my_soffice = $(MISC)/installation/opt/openoffice.org3/program/soffice
-.END
-
-ALLTAR: smoketest
-
-smoketest .PHONY: $(MISC)/installation.flag $(SHL1TARGETN) \
-        $(MISC)/services.rdb $(BIN)/smoketestdoc.sxw
-    $(RM) -r $(MISC)/user
-    $(MKDIR) $(MISC)/user
-    $(CPPUNITTESTER) $(SHL1TARGETN) \
-        -env:UNO_SERVICES=$(my_file)$(PWD)/$(MISC)/services.rdb \
-        -env:UNO_TYPES=$(my_file)$(SOLARBINDIR)/types.rdb \
-        -env:arg-path=$(my_soffice) -env:arg-user=$(MISC)/user \
-        -env:arg-env=$(OOO_LIBRARY_PATH_VAR)"$${{$(OOO_LIBRARY_PATH_VAR)+=$$$(OOO_LIBRARY_PATH_VAR)}}" \
-        -env:arg-doc=$(BIN)/smoketestdoc.sxw
-.IF "$(OS)" == "WNT"
-    $(RM) -r $(MISC)/installation.flag `cat $(MISC)/installation.flag`
-.ENDIF
-
-# Work around Windows problems with long pathnames (see issue 50885) by
-# installing into the temp directory instead of the module output tree (in which
-# case installation.flag contains the path to the temp installation, which is
-# removed after smoketest); can be removed once issue 50885 is fixed:
-.IF "$(OS)" == "WNT"
-$(MISC)/installation.flag: $(shell ls $(my_instset)/OOo_*_install.zip)
-    my_tmp=$$(cygpath -m $$(mktemp -dt ooosmoke.XXXXXX)) && \
-    unzip $(my_instset)/OOo_*_install.zip -d "$$my_tmp" && \
-    mv "$$my_tmp"/OOo_*_install "$$my_tmp"/opt && \
-    echo "$$my_tmp" > $@
-.ELSE
-$(MISC)/installation.flag: $(shell ls $(my_instset)/OOo_*_install.tar.gz)
-    $(RM) -r $(MISC)/installation
-    $(MKDIR) $(MISC)/installation
-    cd $(MISC)/installation && $(GNUTAR) xfz $(my_instset)/OOo_*_install.tar.gz
-    $(MV) $(MISC)/installation/OOo_*_install $(MISC)/installation/opt
-    $(TOUCH) $@
-.END
-
-$(MISC)/services.rdb:
-    $(RM) $@
-    $(REGCOMP) -register -r $@ -wop -c bridgefac.uno -c connector.uno \
-        -c remotebridge.uno -c uuresolver.uno
+OOO_CPPTEST_ARGS = $(SHL1TARGETN) -env:arg-doc=$(BIN)/smoketestdoc.sxw
 
 $(BIN)/smoketestdoc.sxw: data/smoketestdoc.sxw
     $(COPY) $< $@