diff options
| author | Petr Mladek <pmladek@suse.cz> | 2011-11-25 19:30:08 +0100 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2011-12-01 21:16:47 +0100 |
| commit | 8c478c911033243df90ba290b32732a1fd70130e (patch) | |
| tree | 98f031b9428103aca8dff385681c0a633a41d382 /solenv | |
| parent | 86adb5cacb4fe3e7fb869299447da5876f0da30d (diff) | |
create installation set for tests
+ it currently includes just the smoketest and is available only for Linux
+ the side effect is that it builds the smoketest before instsetoo_native
+ it runs it only during dev-install when the variable RUN_SMOKETEST == YES
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/bin/modules/installer/download.pm | 4 | ||||
| -rw-r--r-- | solenv/gbuild/extensions/post_BuildplTargets.mk | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/solenv/bin/modules/installer/download.pm b/solenv/bin/modules/installer/download.pm index c647740cde2e..b16a3b2aedc2 100644 --- a/solenv/bin/modules/installer/download.pm +++ b/solenv/bin/modules/installer/download.pm @@ -400,6 +400,10 @@ sub get_downloadname_productname if (( $allvariables->{'PRODUCTNAME'} eq "LibO-dev" ) && ( $allvariables->{'POSTVERSIONEXTENSION'} eq "SDK" )) { $start = "LibO-Dev-SDK"; } + if (( $allvariables->{'PRODUCTNAME'} eq "LibreOffice" ) && ( $allvariables->{'POSTVERSIONEXTENSION'} eq "TEST" )) { $start = "LibO-Test"; } + + if (( $allvariables->{'PRODUCTNAME'} eq "LibO-dev" ) && ( $allvariables->{'POSTVERSIONEXTENSION'} eq "TEST" )) { $start = "LibO-Dev-Test"; } + if ( $allvariables->{'PRODUCTNAME'} eq "URE" ) { $start = "LibO-URE"; } if ( $allvariables->{'PRODUCTNAME'} eq "OxygenOffice" ) { $start = "OOOP"; } diff --git a/solenv/gbuild/extensions/post_BuildplTargets.mk b/solenv/gbuild/extensions/post_BuildplTargets.mk index 553257945f3a..b0af960ee2e8 100644 --- a/solenv/gbuild/extensions/post_BuildplTargets.mk +++ b/solenv/gbuild/extensions/post_BuildplTargets.mk @@ -55,7 +55,8 @@ endef .PHONY: smoketestoo_native instsetoo_native cross-build-toolset dev-install all build findunusedcode smoketestoo_native: $(WORKDIR)/bootstrap $(SRCDIR)/src.downloaded $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross_toolset) | instsetoo_native - $(call gb_BuildplTarget_command,$@,$(if $(filter instsetoo_native,$(gb_BuildplTarget_COMPLETEDTARGETS)),--from instsetoo_native,--all)) + $(eval export RUN_SMOKETEST := YES) + $(call gb_BuildplTarget_command,$@,$(if $(filter instsetoo_native,$(gb_BuildplTarget_COMPLETEDTARGETS)),--from smoketestoo_native,--all)) instsetoo_native: $(WORKDIR)/bootstrap $(SRCDIR)/src.downloaded $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross_toolset) $(call gb_BuildplTarget_command,$@,--all) |