diff options
| author | Ruediger Timm <rt@openoffice.org> | 2010-04-21 09:58:45 +0200 |
|---|---|---|
| committer | Ruediger Timm <rt@openoffice.org> | 2010-04-21 09:58:45 +0200 |
| commit | 388184507429ef932cfa6d725ea146063a69d934 (patch) | |
| tree | e6e07e7d20d1b0dda7989e9bc280bf4cf9f46bc4 /smoketestoo_native | |
| parent | 48e311b6e9c936ef9a7bbead79e63966014e3d77 (diff) | |
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.
Notes
Notes:
split repo tag: testing_ooo/DEV300_m77
Diffstat (limited to 'smoketestoo_native')
| -rw-r--r-- | smoketestoo_native/makefile.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/smoketestoo_native/makefile.mk b/smoketestoo_native/makefile.mk index b288c77181f5..8b497ddb4727 100644 --- a/smoketestoo_native/makefile.mk +++ b/smoketestoo_native/makefile.mk @@ -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 |