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.

This commit is contained in:
Ruediger Timm 2010-04-21 09:58:45 +02:00
parent 48e311b6e9
commit 3881845074

View file

@ -56,12 +56,12 @@ $(BIN)/smoketestdoc.sxw: data/smoketestdoc.sxw
.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