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 | 41d1364fb686f2b20e91f728894a66ef34d89e8c (patch) | |
| tree | f881951792cfc15a6856c208b0f711e297096fc2 /solenv/inc/installationtest.mk | |
| parent | DEV300 masterfix: #i10000#: create pus subdirectory (diff) | |
| download | core-41d1364fb686f2b20e91f728894a66ef34d89e8c.tar.gz core-41d1364fb686f2b20e91f728894a66ef34d89e8c.zip | |
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.
Diffstat (limited to 'solenv/inc/installationtest.mk')
| -rw-r--r-- | solenv/inc/installationtest.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/solenv/inc/installationtest.mk b/solenv/inc/installationtest.mk index 6aef79c1cd0f..56b94b542c71 100644 --- a/solenv/inc/installationtest.mk +++ b/solenv/inc/installationtest.mk @@ -35,8 +35,8 @@ my_file = file:// .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) |