Commits

Anonymous committed 0f69f96

DEV300 masterfix: #i10000#: Some fixes for the new smoketest: solenv/inc/installationtest.mk used wrong variables (UPDMINOR is not set on RE master builds, use LAST_MINOR from minor.mk instead), smoketestoo_native/makefile.mk needed adaptions to new install set naming scheme.

  • Participants
  • Parent commits c3448a3

Comments (0)

Files changed (2)

File smoketestoo_native/makefile.mk

 
 .IF "$(OS)" != "WNT"
 $(installationtest_instpath).flag : \
-        $(shell ls $(installationtest_instset)/OOo_*_install.tar.gz)
+        $(shell ls $(installationtest_instset)/OOo_*_install_*.tar.gz)
     $(RM) -r $(installationtest_instpath)
     $(MKDIRHIER) $(installationtest_instpath)
     cd $(installationtest_instpath) && \
-        $(GNUTAR) xfz $(installationtest_instset)/OOo_*_install.tar.gz
-    $(MV) $(installationtest_instpath)/OOo_*_install \
+        $(GNUTAR) xfz $(installationtest_instset)/OOo_*_install_*.tar.gz
+    $(MV) $(installationtest_instpath)/OOo_*_install_* \
         $(installationtest_instpath)/opt
     $(TOUCH) $@
 cpptest : $(installationtest_instpath).flag

File solenv/inc/installationtest.mk

 .IF "$(UPDATER)" == "YES" && "$(SHIPDRIVE)" != "" && \
     "$(CWS_WORK_STAMP)" == "" && "$(SOLARENV:s/$(SOL_TMP)//" == "$(SOLARENV)"
 my_instsets = $(shell ls -dt \
-    $(SHIPDRIVE)/$(INPATH)/OpenOffice/archive/$(WORK_STAMP)_$(UPDMINOR)_native_packed-*_$(defaultlangiso).$(BUILD))
-installationtest_instset = $(installationtest_instsets:1)
+    $(SHIPDRIVE)/$(INPATH)/OpenOffice/archive/$(WORK_STAMP)_$(LAST_MINOR)_native_packed-*_$(defaultlangiso).$(BUILD))
+installationtest_instset = $(my_instsets:1)
 .ELSE
 installationtest_instset = \
     $(SOLARSRC)/instsetoo_native/$(INPATH)/OpenOffice/archive/install/$(defaultlangiso)