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

18 files changed, 591 insertions, 8 deletions

diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk
index 16cc3a6c41d3..39677d26b185 100644
--- a/instsetoo_native/util/makefile.mk
+++ b/instsetoo_native/util/makefile.mk
@@ -104,7 +104,7 @@ ALLTAR : openoffice_$(defaultlangiso) ooolanguagepack $(eq,$(OS),MACOSX $(NULL)
 .IF "$(GUI)"=="WNT"
 ALLTAR : openofficeall ooohelppack sdkooall
 .ELSE
-ALLTAR : openoffice_$(defaultlangiso) ooolanguagepack $(eq,$(OS),MACOSX $(NULL) ooohelppack) sdkoo_en-US
+ALLTAR : openoffice_$(defaultlangiso) ooolanguagepack $(eq,$(OS),MACOSX $(NULL) ooohelppack) sdkoo_en-US $(eq,$(OS),MACOSX $(NULL) lotest_en-US)
 .ENDIF
 .ENDIF
 .ELSE # "$(ENABLE_RELEASE_BUILD)"=="TRUE"
@@ -118,7 +118,7 @@ ALLTAR : openofficedev_$(defaultlangiso) ooodevlanguagepack $(eq,$(OS),MACOSX $(
 .IF "$(GUI)"=="WNT"
 ALLTAR : openofficedevall ooodevhelppack sdkoodevall
 .ELSE
-ALLTAR : openofficedev_$(defaultlangiso) ooodevlanguagepack $(eq,$(OS),MACOSX $(NULL) ooodevhelppack) sdkoodev_en-US
+ALLTAR : openofficedev_$(defaultlangiso) ooodevlanguagepack $(eq,$(OS),MACOSX $(NULL) ooodevhelppack) sdkoodev_en-US $(eq,$(OS),MACOSX $(NULL) lodevtest_en-US)
 .ENDIF
 .ENDIF
 .ENDIF # "$(ENABLE_RELEASE_BUILD)"=="TRUE"
@@ -167,6 +167,10 @@ sdkoo: $(foreach,i,$(alllangiso) sdkoo_$i)
 
 sdkoodev: $(foreach,i,$(alllangiso) sdkoodev_$i)
 
+lotest: $(foreach,i,$(alllangiso) lotest_$i)
+
+lodevtest: $(foreach,i,$(alllangiso) lodevtest_$i)
+
 ure: $(foreach,i,$(alllangiso) ure_$i)
 
 oxygenoffice: $(foreach,i,$(alllangiso) oxygenoffice_$i)
@@ -182,6 +186,7 @@ MSILANGPACKTEMPLATESOURCE=$(PRJ)$/inc_ooolangpack$/windows$/msi_templates
 MSIHELPPACKTEMPLATESOURCE=$(PRJ)$/inc_ooohelppack$/windows$/msi_templates
 MSIURETEMPLATESOURCE=$(PRJ)$/inc_ure$/windows$/msi_templates
 MSISDKOOTEMPLATESOURCE=$(PRJ)$/inc_sdkoo$/windows$/msi_templates
+MSITESTTEMPLATESOURCE=$(PRJ)$/inc_lotest$/windows$/msi_templates
 MSICOMMONTEMPLATESOURCE=$(PRJ)$/inc_common$/windows$/msi_templates
 
 NOLOGOSPLASH:=$(BIN)$/intro.zip
@@ -191,6 +196,7 @@ MSILANGPACKTEMPLATEDIR=$(MISC)$/ooolangpack$/msi_templates
 MSIHELPPACKTEMPLATEDIR=$(MISC)$/ooohelppack$/msi_templates
 MSIURETEMPLATEDIR=$(MISC)$/ure$/msi_templates
 MSISDKOOTEMPLATEDIR=$(MISC)$/sdkoo$/msi_templates
+MSITESTTEMPLATEDIR=$(MISC)$/lotest$/msi_templates
 
 ADDDEPS=$(NOLOGOSPLASH) $(DEVNOLOGOSPLASH)
 .IF "$(OS)" == "WNT"
@@ -216,6 +222,10 @@ $(foreach,i,$(alllangiso) sdkoo_$i) : $(ADDDEPS)
 
 $(foreach,i,$(alllangiso) sdkoodev_$i) : $(ADDDEPS)
 
+$(foreach,i,$(alllangiso) lotest_$i) : $(ADDDEPS)
+
+$(foreach,i,$(alllangiso) lodevtest_$i) : $(ADDDEPS)
+
 $(foreach,i,$(alllangiso) ure_$i) : $(ADDDEPS)
 
 $(foreach,i,$(alllangiso) oxygenoffice_$i) : $(ADDDEPS)
@@ -274,6 +284,15 @@ $(foreach,i,$(alllangiso) sdkoodev_$i) : $$@{$(PKGFORMAT:^".")}
 sdkoodev_%{$(PKGFORMAT:^".")} :
     $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p LibreOffice_Dev_SDK -u $(OUT) -buildid $(BUILD) -msitemplate $(MSISDKOOTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -dontstrip -format $(@:e:s/.//) $(VERBOSESWITCH)
 
+$(foreach,i,$(alllangiso) lotest_$i) : $$@{$(PKGFORMAT:^".")}
+lotest_%{$(PKGFORMAT:^".")} :
+    $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p LibreOffice_Test -u $(OUT) -buildid $(BUILD) -msitemplate $(MSITESTTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -dontstrip -format $(@:e:s/.//) $(VERBOSESWITCH)
+
+$(foreach,i,$(alllangiso) lodevtest_$i) : $$@{$(PKGFORMAT:^".")}
+lodevtest_%{$(PKGFORMAT:^".")} :
+    $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p LibreOffice_Dev_Test -u $(OUT) -buildid $(BUILD) -msitemplate $(MSITESTTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -dontstrip -format $(@:e:s/.//) $(VERBOSESWITCH)
+
+
 $(foreach,i,$(alllangiso) ure_$i) : $$@{$(PKGFORMAT:^".")}
 ure_%{$(PKGFORMAT:^".")} :
 .IF "$(OS)" == "MACOSX"
@@ -316,7 +335,7 @@ openoffice:
 
 .IF "$(DISABLE_PYTHON)" != "TRUE"
 .IF "$(LOCALPYFILES)"!=""
-$(foreach,i,$(alllangiso) openoffice_$i{$(PKGFORMAT:^".") .archive} openofficewithjre_$i{$(PKGFORMAT:^".")} openofficedev_$i{$(PKGFORMAT:^".")} sdkoo_$i{$(PKGFORMAT:^".")} oxygenoffice_$i{$(PKGFORMAT:^".") .archive} oxygenofficewithjre_$i{$(PKGFORMAT:^".")}) updatepack : $(LOCALPYFILES)
+$(foreach,i,$(alllangiso) openoffice_$i{$(PKGFORMAT:^".") .archive} openofficewithjre_$i{$(PKGFORMAT:^".")} openofficedev_$i{$(PKGFORMAT:^".")} sdkoo_$i{$(PKGFORMAT:^".")} lotest_$i{$(PKGFORMAT:^".")} oxygenoffice_$i{$(PKGFORMAT:^".") .archive} oxygenofficewithjre_$i{$(PKGFORMAT:^".")}) updatepack : $(LOCALPYFILES)
 .ENDIF			# "$(LOCALPYFILES)"!=""
 
 .IF "$(GUI)"!="WNT"
@@ -341,11 +360,13 @@ hack_msitemplates .PHONY:
     -$(MKDIRHIER) $(MSIHELPPACKTEMPLATEDIR)
     -$(MKDIRHIER) $(MSIURETEMPLATEDIR)
     -$(MKDIRHIER) $(MSISDKOOTEMPLATEDIR)
+    -$(MKDIRHIER) $(MSITESTTEMPLATEDIR)
     -$(MKDIRHIER) $(MSIOFFICETEMPLATEDIR)$/Binary
     -$(MKDIRHIER) $(MSILANGPACKTEMPLATEDIR)$/Binary
     -$(MKDIRHIER) $(MSIHELPPACKTEMPLATEDIR)$/Binary
     -$(MKDIRHIER) $(MSIURETEMPLATEDIR)$/Binary
     -$(MKDIRHIER) $(MSISDKOOTEMPLATEDIR)$/Binary
+    -$(MKDIRHIER) $(MSITESTTEMPLATEDIR)$/Binary
     $(GNUCOPY) -u $(MSIOFFICETEMPLATESOURCE)$/*.* $(MSIOFFICETEMPLATEDIR)
     $(GNUCOPY) -u $(MSILANGPACKTEMPLATESOURCE)$/*.* $(MSILANGPACKTEMPLATEDIR)
     $(GNUCOPY) -u $(MSIHELPPACKTEMPLATESOURCE)$/*.* $(MSIHELPPACKTEMPLATEDIR)
@@ -356,16 +377,19 @@ hack_msitemplates .PHONY:
     $(GNUCOPY) -u $(MSICOMMONTEMPLATESOURCE)$/Binary$/*.* $(MSIHELPPACKTEMPLATEDIR)$/Binary
     $(GNUCOPY) -u $(MSICOMMONTEMPLATESOURCE)$/Binary$/*.* $(MSIURETEMPLATEDIR)$/Binary
     $(GNUCOPY) -u $(MSICOMMONTEMPLATESOURCE)$/Binary$/*.* $(MSISDKOOTEMPLATEDIR)$/Binary
+    $(GNUCOPY) -u $(MSICOMMONTEMPLATESOURCE)$/Binary$/*.* $(MSITESTTEMPLATEDIR)$/Binary
     $(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSIOFFICETEMPLATEDIR)$/Binary$/Image.bmp
     $(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSILANGPACKTEMPLATEDIR)$/Binary$/Image.bmp
     $(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSIHELPPACKTEMPLATEDIR)$/Binary$/Image.bmp
     $(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSIURETEMPLATEDIR)$/Binary$/Image.bmp
     $(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSISDKOOTEMPLATEDIR)$/Binary$/Image.bmp
+    $(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSITESTTEMPLATEDIR)$/Binary$/Image.bmp
     $(COPY) $(PRJ)$/res$/nologobanner.bmp $(MSIOFFICETEMPLATEDIR)$/Binary$/Banner.bmp
     $(COPY) $(PRJ)$/res$/nologobanner.bmp $(MSILANGPACKTEMPLATEDIR)$/Binary$/Banner.bmp
     $(COPY) $(PRJ)$/res$/nologobanner.bmp $(MSIHELPPACKTEMPLATEDIR)$/Binary$/Banner.bmp
     $(COPY) $(PRJ)$/res$/nologobanner.bmp $(MSIURETEMPLATEDIR)$/Binary$/Banner.bmp
     $(COPY) $(PRJ)$/res$/nologobanner.bmp $(MSISDKOOTEMPLATEDIR)$/Binary$/Banner.bmp
+    $(COPY) $(PRJ)$/res$/nologobanner.bmp $(MSITESTTEMPLATEDIR)$/Binary$/Banner.bmp
 
 .IF "$(OS)" == "WNT"
 
@@ -379,5 +403,9 @@ sdkooall: hack_msitemplates $(LOCALPYFILES) sdkoo_$(ALLLANGSTRING:s/ /,/)$(PKGFO
 
 sdkoodevall: hack_msitemplates $(LOCALPYFILES) sdkoodev_$(ALLLANGSTRING:s/ /,/)$(PKGFORMAT:^".")
 
+lotestall: hack_msitemplates $(LOCALPYFILES) lotest_$(ALLLANGSTRING:s/ /,/)$(PKGFORMAT:^".")
+
+lodevtestall: hack_msitemplates $(LOCALPYFILES) lodevtest_$(ALLLANGSTRING:s/ /,/)$(PKGFORMAT:^".")
+
 .ENDIF			# "$(OS)" == "WNT"
 
diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst
index 88837134c856..68423c924548 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -371,6 +371,104 @@ LibreOffice_Dev_SDK
     }
 }
 
+LibreOffice_Test
+{
+    Settings
+    {
+        downloadname LO-Test_{packageversion}_{os}_install_{languages}
+        variables
+        {
+            PRODUCTNAME LibreOffice
+            PRODUCTVERSION 3.5
+            PRODUCTEXTENSION
+            LONG_PRODUCTEXTENSION
+            SHORT_PRODUCTEXTENSION alpha0
+            POSTVERSIONEXTENSION TEST
+            POSTVERSIONEXTENSIONUNIX test
+            BRANDPACKAGEVERSION 3.5
+            PACKAGEVERSION 3.5.0
+            PACKAGEREVISION {buildid}
+            PACK_INSTALLED 1
+            POOLPRODUCT 0
+            DMG_VOLUMEEXTENSION TEST
+            DATABASENAME libreoffice35test
+            NO_README_IN_ROOTDIR 1
+            LICENSENAME LGPL
+            IGNOREDIRECTORYLAYER 1
+            NOVERSIONINDIRNAME 0
+            NOSPACEINDIRECTORYNAME 1
+            NOSHORTDIRECTORYNAMES 1
+            CHANGETARGETDIR 1
+            DOWNLOADBANNER ooobanner.bmp
+	    DOWNLOADBITMAP ooobitmap.bmp
+	    DOWNLOADSETUPICO ooosetup.ico
+            DONTUSESTARTMENUFOLDER 1
+            RELATIVE_PATHES_IN_DDF 1
+            STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/
+            STARTCENTER_INFO_URL http://www.libreoffice.org/
+            STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/
+            STARTCENTER_LAYOUT_STYLE 0
+            DICT_REPO_URL http://extensions.libreoffice.org/dictionaries/
+        }
+        active 1
+        compression 5
+        script test
+        include {solarenvpath}/{os}/loader2,{solarpath}/bin.{minor}/cppunit,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor}
+    }
+}
+
+LibreOffice_Dev_Test
+{
+    Settings
+    {
+        downloadname LO-Dev-Test_{packageversion}_{os}_install_{languages}
+        variables
+        {
+            PRODUCTNAME LibO-dev
+            PRODUCTVERSION 3.5
+            PRODUCTEXTENSION
+            LONG_PRODUCTEXTENSION
+            SHORT_PRODUCTEXTENSION alpha0
+            UNIXBASISROOTNAME lo-dev
+            POSTVERSIONEXTENSION TEST
+            POSTVERSIONEXTENSIONUNIX test
+            BRANDPACKAGEVERSION 3.5
+            PACKAGEVERSION 3.5.0
+            PACKAGEREVISION {buildid}
+            BASISPACKAGEPREFIX libobasis-dev
+            UREPACKAGEPREFIX lodev
+            SOLSUREPACKAGEPREFIX lodev
+            REGISTRYLAYERNAME LayerDev
+			DEVELOPMENTPRODUCT 1
+            PACK_INSTALLED 1
+            POOLPRODUCT 0
+            DMG_VOLUMEEXTENSION TEST
+            DATABASENAME libreoffice35devtest
+            NO_README_IN_ROOTDIR 1
+            LICENSENAME LGPL
+            IGNOREDIRECTORYLAYER 1
+            NOVERSIONINDIRNAME 0
+            NOSPACEINDIRECTORYNAME 1
+            NOSHORTDIRECTORYNAMES 1
+            CHANGETARGETDIR 1
+            DOWNLOADBANNER ooobanner.bmp
+	    DOWNLOADBITMAP ooobitmap.bmp
+            DOWNLOADSETUPICO ooosetup.ico
+            DONTUSESTARTMENUFOLDER 1
+            RELATIVE_PATHES_IN_DDF 1
+            STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/
+            STARTCENTER_INFO_URL http://www.libreoffice.org/
+            STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/
+            STARTCENTER_LAYOUT_STYLE 0
+            DICT_REPO_URL http://extensions.libreoffice.org/dictionaries/
+        }
+        active 1
+        compression 5
+        script test
+        include {solarenvpath}/{os}/loader2,{solarpath}/bin.{minor}/cppunit,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor}
+    }
+}
+
 OxygenOffice
 {
 	Settings
diff --git a/instsetoo_native/util/pack.lst b/instsetoo_native/util/pack.lst
index 2832afb3c4c7..c7e1834f0728 100644
--- a/instsetoo_native/util/pack.lst
+++ b/instsetoo_native/util/pack.lst
@@ -13,6 +13,7 @@ LibreOffice_wJRE        unxlngi6.pro,unxmacxi.pro,unxsoli4.pro,unxsols4.pro,wntm
 #LibreOffice_Dev  unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxmacxi.pro,unxlngx6.pro    en-US   openofficedev
 LibreOffice_SDK         unxlngi6.pro,unxmacxi.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro  en-US   sdkoo
 #LibreOffice_Dev_SDK  unxlngi6.pro,unxmacxi.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro  en-US   sdkoodev
+LibreOffice_Test         unxlngi6.pro,unxmacxi.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro  en-US   test
 #URE             unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngi6,unxsoli4,unxsols4,wntmsci12  en-US   ure
 LibreOfficeLanguagepack unxlngi6.pro,unxmacxi.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro en-US|ar|as|ast|be|bg|bn|ca|ca-XV|cs|da|de|dz|el|en-GB|eo|es|et|eu|fi|fr|ga|gl|gu|he|hi|hu|id|is|it|ja|ka|km|kn|ko|ku|lt|lv|mk|ml|mr|my|nb|nl|nn|oc|om|or|pa-IN|pl|pt|pt-BR|ro|ru|sh|si|sk|sl|sr|sv|ta|te|th|tr|ug|uk|uz|vi|zh-CN|zh-TW ooolanguagepack
 #LibreOfficeLanguagepack   unxlngi6,unxsoli4,unxsols4,wntmsci12,unxmacxi                                     de      ooolanguagepack
diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst
index b8eb41e510f8..b24eb7b9849e 100644
--- a/postprocess/prj/build.lst
+++ b/postprocess/prj/build.lst
@@ -1,4 +1,4 @@
-po      postprocess     ::      accessibility BINFILTER:binfilter configmgr CRASHREP:crashrep CT2N:ct2n dtrans embeddedobj embedserv EPM:epm DESKTOP:extensions extras DESKTOP:fpicker HELP:helpcontent2 io LIBRSVG:librsvg lingucomponent ODK:odk officecfg psprint_config remotebridges scaddins scp2 DESKTOP:setup_native sysui testtools ucb UnoControls ure wizards MORE_FONTS:more_fonts DICTIONARIES:dictionaries PYUNO:pyuno readlicense_oo DESKTOP:unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder LANGUAGETOOL:languagetool SDEXT:sdext MYSQLC:mysqlc NLPSOLVER:nlpsolver STLPORT:stlport LIBXSLT:libxslt tail_build NULL
+po      postprocess     ::      accessibility BINFILTER:binfilter configmgr CRASHREP:crashrep CT2N:ct2n dtrans embeddedobj embedserv EPM:epm DESKTOP:extensions extras DESKTOP:fpicker HELP:helpcontent2 io LIBRSVG:librsvg lingucomponent ODK:odk officecfg psprint_config remotebridges scaddins scp2 DESKTOP:setup_native sysui testtools ucb UnoControls ure wizards MORE_FONTS:more_fonts DICTIONARIES:dictionaries PYUNO:pyuno readlicense_oo DESKTOP:unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder LANGUAGETOOL:languagetool SDEXT:sdext MYSQLC:mysqlc NLPSOLVER:nlpsolver STLPORT:stlport LIBXSLT:libxslt smoketestoo_native tail_build NULL
 po	postprocess			    	usr1	-	all	po_mkout NULL
 po	postprocess\checkxml		nmake	-	all	po_checkxml NULL
 po	postprocess\packconfig		nmake	-	all	po_packconfig po_checkxml NULL
diff --git a/scp2/prj/build.lst b/scp2/prj/build.lst
index 8f1397068296..083461558fcd 100644
--- a/scp2/prj/build.lst
+++ b/scp2/prj/build.lst
@@ -19,6 +19,7 @@ cp    scp2\source\ooo             nmake    -    all    cp_ooo cp_langmacros cp_l
 cp    scp2\source\python          nmake    -    all    cp_python cp_langmacros cp_langtemplates NULL
 cp    scp2\source\quickstart      nmake    -    all    cp_quickstart cp_langmacros cp_langtemplates NULL
 cp    scp2\source\sdkoo           nmake    -    all    cp_sdkoo cp_langmacros cp_langtemplates NULL
+cp    scp2\source\smoketest       nmake    -    all    cp_smoketest cp_langmacros cp_langtemplates NULL
 cp    scp2\source\testtool        nmake    -    all    cp_testtool cp_langmacros cp_langtemplates NULL
 cp    scp2\source\writer          nmake    -    all    cp_writer cp_langmacros cp_langtemplates NULL
 cp    scp2\source\base            nmake    -    all    cp_base cp_langmacros cp_langtemplates NULL
@@ -26,4 +27,4 @@ cp    scp2\source\xsltfilter      nmake    -    all    cp_xsltfilter cp_langmacr
 cp    scp2\source\winexplorerext  nmake    -    all    cp_winexplorerext cp_langmacros cp_langtemplates NULL
 cp    scp2\source\onlineupdate    nmake    -    all    cp_update cp_langmacros cp_langtemplates NULL
 cp    scp2\source\accessories     nmake    -    all    cp_accessories cp_langmacros NULL
-cp    scp2\util                   nmake    -    all    cp_util cp_activex cp_binfilter cp_calc cp_canvas cp_crashrep cp_draw cp_extensions cp_gnome cp_graphicfilter cp_impress cp_javafilter cp_kde cp_math cp_ooo cp_python cp_quickstart cp_testtool cp_writer cp_base cp_xsltfilter cp_winexplorerext cp_sdkoo cp_update cp_accessories NULL
+cp    scp2\util                   nmake    -    all    cp_util cp_activex cp_binfilter cp_calc cp_canvas cp_crashrep cp_draw cp_extensions cp_gnome cp_graphicfilter cp_impress cp_javafilter cp_kde cp_math cp_ooo cp_python cp_quickstart cp_testtool cp_smoketest cp_writer cp_base cp_xsltfilter cp_winexplorerext cp_sdkoo cp_update cp_accessories NULL
diff --git a/scp2/prj/d.lst b/scp2/prj/d.lst
index 37aaabbbae2a..0c19b55b0c6c 100644
--- a/scp2/prj/d.lst
+++ b/scp2/prj/d.lst
@@ -4,6 +4,8 @@
 ..\%__SRC%\bin\osl\ure.ins %_DEST%\bin\ure.ins
 ..\%__SRC%\bin\osl\sdkoo.inf %_DEST%\bin\sdkoo.inf
 ..\%__SRC%\bin\osl\sdkoo.ins %_DEST%\bin\sdkoo.ins
+..\%__SRC%\bin\osl\test.inf %_DEST%\bin\test.inf
+..\%__SRC%\bin\osl\test.ins %_DEST%\bin\test.ins
 ..\%__SRC%\bin\osl\setup_osljre.inf %_DEST%\bin\setup_osljre.inf
 ..\%__SRC%\bin\osl\setup_osljre.ins %_DEST%\bin\setup_osljre.ins
 
diff --git a/scp2/source/smoketest/makefile.mk b/scp2/source/smoketest/makefile.mk
new file mode 100644
index 000000000000..27d0ee3d292c
--- /dev/null
+++ b/scp2/source/smoketest/makefile.mk
@@ -0,0 +1,42 @@
+#***********************************************************************
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# [ Copyright (C) 2011 Petr Mladek <pmladek@suse.cz> (initial developer) ]
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#***********************************************************************
+
+PRJ=..$/..
+PRJNAME=scp2so
+TARGET=smoketest
+
+.INCLUDE: settings.mk
+
+SCP_PRODUCT_TYPE=osl
+
+PARFILES= \
+        smoketest.par          
+
+
+.INCLUDE: target.mk
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/scp2/source/smoketest/module_smoketest.scp b/scp2/source/smoketest/module_smoketest.scp
new file mode 100644
index 000000000000..480dd9c793af
--- /dev/null
+++ b/scp2/source/smoketest/module_smoketest.scp
@@ -0,0 +1,50 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * Major Contributor(s):
+ * [ Copyright (C) 2011 Petr Mladek <pmladek@suse.cz> (initial developer) ]
+ *
+ * All Rights Reserved.
+ *
+ * For minor contributions see the git repository.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+#include "macros.inc"
+
+Module gid_Module_Optional_Smoketest
+    PackageInfo = "packinfo_test.txt";
+    MOD_NAME_DESC ( MODULE_OPTIONAL_SMOKETEST );
+    Sortkey = "630";
+    ParentID = gid_Module_Optional;
+    Default = NO;
+    Files = (gid_Test_File_Txt_License,
+             gid_Test_File_Txt_Readme,
+             gid_Test_File_Misc_Smoketestdoc,
+             gid_Test_File_Misc_TypesRdb,
+             gid_Test_File_Bin_LOSmoketest,
+             gid_Test_File_Exe_Cppunittester,
+             gid_Test_File_Lib_Cppunit,
+             gid_Test_File_Lib_Smoketest,
+             gid_Test_File_Lib_Test,
+             gid_Test_File_Lib_Unotest,
+             gid_Test_File_Lib_Unoexceptionprotector);
+End
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/scp2/source/smoketest/module_smoketest.ulf b/scp2/source/smoketest/module_smoketest.ulf
new file mode 100644
index 000000000000..a29a9fde1798
--- /dev/null
+++ b/scp2/source/smoketest/module_smoketest.ulf
@@ -0,0 +1,35 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * Major Contributor(s):
+ * [ Copyright (C) 2011 Petr Mladek <pmladek@suse.cz> (initial developer) ]
+ *
+ * All Rights Reserved.
+ *
+ * For minor contributions see the git repository.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+[STR_NAME_MODULE_OPTIONAL_SMOKETEST]
+en-US = "%PRODUCTNAME %PRODUCTVERSION Smoketest"
+
+[STR_DESC_MODULE_OPTIONAL_SMOKETEST]
+en-US = "The smoketest of %PRODUCTNAME %PRODUCTVERSION"
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/scp2/source/smoketest/smoketest.scp b/scp2/source/smoketest/smoketest.scp
new file mode 100644
index 000000000000..dc4f6d38d9e7
--- /dev/null
+++ b/scp2/source/smoketest/smoketest.scp
@@ -0,0 +1,204 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * Major Contributor(s):
+ * [ Copyright (C) 2011 Petr Mladek <pmladek@suse.cz> (initial developer) ]
+ *
+ * All Rights Reserved.
+ *
+ * For minor contributions see the git repository.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+#include "macros.inc"
+
+Installation gid_Installation_Test
+    ProductName = "${PRODUCTNAME}";
+    ProductVersion = "${PRODUCTVERSION}";
+    ProductExtension = "${PRODUCTEXTENSION}";
+#if defined WNT
+    DefaultDestPath = "<winprogpath>\%PRODUCTNAME";
+#else
+    DefaultDestPath = "/opt/%PRODUCTNAME";
+#endif
+End
+
+Module gid_Module_Root_Smoketest
+    Name = "smoketest";
+    Description = "smoketest";
+    PackageInfo = "packinfo_test.txt";
+End
+
+#ifndef MACOSX
+Directory gid_Test_Dir_Brand_Root
+    ParentID = PREDEFINED_PROGDIR;
+  #ifdef WNT
+    HostName = "${PRODUCTNAME} ${BRANDPACKAGEVERSION}";
+  #else
+    HostName = ".";
+  #endif
+    Styles = (OFFICEDIRECTORY,ISINSTALLLOCATION,CREATE);
+End
+#endif
+
+Directory gid_Test_Brand_Dir_Program
+#if defined MACOSX
+    ParentID = gid_Test_Dir_Bundle_Contents;
+    DosName = "MacOS";
+#else
+    ParentID = gid_Test_Dir_Brand_Root;
+    DosName = "program";
+#endif
+End
+
+Directory gid_Test_Brand_Dir_Share
+#if defined MACOSX
+    ParentID = gid_Test_Dir_Bundle_Contents;
+#else
+    ParentID = gid_Test_Dir_Brand_Root;
+#endif
+    DosName = "share";
+End
+
+Directory gid_Test_Brand_Dir_Share_Test
+    ParentID = gid_Test_Brand_Dir_Share;
+    DosName = "test";
+End
+
+Directory gid_Test_Dir_Common_Ure
+    ParentID = gid_Test_Dir_Brand_Root;
+    HostName = "ure";
+    Styles = (UREDIRECTORY);
+End
+
+Directory gid_Test_Dir_Ure_Share
+    ParentID = gid_Test_Dir_Common_Ure;
+    DosName = "share";
+End
+
+Directory gid_Test_Dir_Ure_Misc
+    ParentID = gid_Test_Dir_Ure_Share;
+    DosName = "misc";
+End
+
+Directory gid_Test_Dir_Ure_Misc_Test
+    ParentID = gid_Test_Dir_Ure_Misc;
+    DosName = "test";
+End
+
+
+File gid_Test_File_Txt_License
+    TXT_FILE_BODY;
+    Dir = gid_Test_Brand_Dir_Share_Test;
+  #ifdef UNX
+    Name = "LICENSE";
+  #endif
+  #ifdef WNT
+    Name = "license.txt";
+  #endif
+    Styles = (PACKED, SCPZIP_REPLACE);
+End
+
+File gid_Test_File_Txt_Readme
+    TXT_FILE_BODY;
+    Dir = gid_Test_Brand_Dir_Share_Test;
+  #ifdef UNX
+    Name = "README_en-US";
+  #endif
+  #ifdef WNT
+    Name = "readme_en-US.txt";
+  #endif
+    Styles = (PACKED, SCPZIP_REPLACE);
+End
+
+File gid_Test_File_Misc_Smoketestdoc
+    TXT_FILE_BODY;
+    Dir = gid_Test_Brand_Dir_Share_Test;
+    Name = "smoketestdoc.sxw";
+    Styles = (PACKED, SCPZIP_REPLACE);
+End
+
+File gid_Test_File_Misc_TypesRdb
+    TXT_FILE_BODY;
+    Dir = gid_Test_Dir_Ure_Misc_Test;
+    Name = "types.rdb";
+    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
+End
+
+File gid_Test_File_Bin_LOSmoketest
+    BIN_FILE_BODY;
+    Dir = gid_Test_Brand_Dir_Program;
+    Name = "losmoketest";
+    Styles = (PACKED);
+End
+
+File gid_Test_File_Exe_Cppunittester
+    BIN_FILE_BODY;
+    Dir = gid_Test_Brand_Dir_Program;
+    Name = "cppunittester";
+    Styles = (PACKED);
+End
+
+File gid_Test_File_Lib_Cppunit
+    TXT_FILE_BODY;
+    Styles = (PACKED);
+    Dir = gid_Test_Brand_Dir_Program;
+  #ifdef UNX
+    Name = STRING(CONCAT3(libcppunit-1.12,UNXSUFFIX,.1));
+  #endif
+End
+
+File gid_Test_File_Lib_Smoketest
+    TXT_FILE_BODY;
+    Styles = (PACKED);
+    Dir = gid_Test_Brand_Dir_Program;
+  #ifdef UNX
+    Name = STRING(CONCAT2(libsmoketest,UNXSUFFIX));
+  #endif
+End
+
+File gid_Test_File_Lib_Test
+    TXT_FILE_BODY;
+    Styles = (PACKED);
+    Dir = gid_Test_Brand_Dir_Program;
+  #ifdef UNX
+    Name = STRING(CONCAT2(libtest,UNXSUFFIX));
+  #endif
+End
+
+File gid_Test_File_Lib_Unotest
+    TXT_FILE_BODY;
+    Styles = (PACKED);
+    Dir = gid_Test_Brand_Dir_Program;
+  #ifdef UNX
+    Name = STRING(CONCAT2(libunotest,UNXSUFFIX));
+  #endif
+End
+
+File gid_Test_File_Lib_Unoexceptionprotector
+    TXT_FILE_BODY;
+    Styles = (PACKED);
+    Dir = gid_Test_Brand_Dir_Program;
+  #ifdef UNX
+    Name = STRING(CONCAT2(unoexceptionprotector,UNXSUFFIX));
+  #endif
+End
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/scp2/util/makefile.mk b/scp2/util/makefile.mk
index 49134a0a3ff0..5d22a7097640 100644
--- a/scp2/util/makefile.mk
+++ b/scp2/util/makefile.mk
@@ -253,5 +253,12 @@ SCP4LINK_PRODUCT_TYPE = osl
 SCP4TARGET = sdkoo
 SCP4FILES = sdkoo.par
 
+# ------------------------------------------------------------------------
+# Test
+
+SCP5LINK_PRODUCT_TYPE = osl
+SCP5TARGET = test
+SCP5FILES = smoketest.par
+
 # --- target -------------------------------------------------------------
 .INCLUDE :  target.mk
diff --git a/setup_native/source/packinfo/packinfo_test.txt b/setup_native/source/packinfo/packinfo_test.txt
new file mode 100644
index 000000000000..757abcf8ad21
--- /dev/null
+++ b/setup_native/source/packinfo/packinfo_test.txt
@@ -0,0 +1,44 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * Major Contributor(s):
+ * [ Copyright (C) 2011 Petr Mladek <pmladek@suse.cz> (initial developer) ]
+ *
+ * All Rights Reserved.
+ *
+ * For minor contributions see the git repository.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+Start
+module = "gid_Module_Root_Smoketest"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-smoketest"
+solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core01, SUNWbtool (Name="CCS tools bundled with SunOS"), SUNWxcu4 (Name="XCU4 Utilities")"
+packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-smoketest"
+freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01"
+requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01"
+copyright = "2010-2011 by LibreOffice Community"
+solariscopyright = "solariscopyrightfile"
+vendor = "The Document Foundation"
+description = "LibreOffice %PRODUCTVERSION Smoketest"
+destpath = "/opt"
+packageversion = "%PACKAGEVERSION"
+End
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/smoketestoo_native/losmoketest b/smoketestoo_native/losmoketest
new file mode 100755
index 000000000000..b3faee16b817
--- /dev/null
+++ b/smoketestoo_native/losmoketest
@@ -0,0 +1,61 @@
+#!/bin/sh
+
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# [ Copyright (C) 2011 Petr Mladek <pmladek@suse.cz> (initial developer) ]
+# [ Copyright (C) 2011 Yifan Jiang <yfjiang@suse.com> ]
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+
+# resolve installation directory
+sd_cwd=`pwd`
+sd_res=$0
+while [ -h "$sd_res" ] ; do
+    cd "`dirname "$sd_res"`"
+    sd_basename=`basename "$sd_res"`
+    sd_res=`ls -l "$sd_basename" | sed "s/.*$sd_basename -> //g"`
+done
+cd "`dirname "$sd_res"`"
+sd_prog=`pwd`
+cd "$sd_cwd"
+
+user_conf_dir=`grep UserInstallation $sd_prog/bootstraprc | sed -e "s|UserInstallation=||" -e "s|\\$SYSUSERCONFIG|$HOME/.config|"`
+
+case "`uname -s`" in
+Linux)
+    sd_prog1="$sd_prog"
+    sd_prog2="$sd_prog/../ure/lib"
+    LD_LIBRARY_PATH=$sd_prog1:$sd_prog2${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
+    export LD_LIBRARY_PATH
+    ;;
+esac
+
+exec $sd_prog/cppunittester \
+	-env:UNO_SERVICES=file://$sd_prog/../ure/share/misc/services.rdb \
+	-env:UNO_TYPES=file://$sd_prog/../ure/share/misc/test/types.rdb \
+	-env:arg-soffice=path:$sd_prog/soffice \
+	-env:arg-user=$user_conf_dir \
+	-env:arg-env=$LD_LIBRARY_PATH \
+	-env:arg-testarg.smoketest.doc=$sd_prog/../share/test/smoketestdoc.sxw  \
+	--protector $sd_prog/unoexceptionprotector.so unoexceptionprotector \
+	$sd_prog/libsmoketest.so
diff --git a/smoketestoo_native/makefile.mk b/smoketestoo_native/makefile.mk
index eceea553b45f..333d646dcab3 100755
--- a/smoketestoo_native/makefile.mk
+++ b/smoketestoo_native/makefile.mk
@@ -49,10 +49,12 @@ DEF1NAME = $(SHL1TARGET)
 .INCLUDE: target.mk
 .INCLUDE: installationtest.mk
 
-.IF "$(depend)" == ""
+.IF "$(depend)" == "" && "$(RUN_SMOKETEST)" == "YES"
 # disable smoketest when cross-compiling for now; we can use wine at some stage (?)
 .IF "$(CROSS_COMPILING)" != "YES"
 ALLTAR : cpptest
+.ELSE
+ALLTAR : 
 .END
 .END
 
diff --git a/smoketestoo_native/prj/build.lst b/smoketestoo_native/prj/build.lst
index e7afaaacb8e5..45439a1f0e87 100644
--- a/smoketestoo_native/prj/build.lst
+++ b/smoketestoo_native/prj/build.lst
@@ -1,4 +1,4 @@
-smtoon smoketestoo_native :: codemaker instsetoo_native javaunohelper soltools test unoil NULL
+smtoon smoketestoo_native :: codemaker javaunohelper soltools test unoil NULL
 smtoon smoketestoo_native\com\sun\star\comp\smoketest nmake - all smoketestoonative_com_sun_star_comp_smoketest NULL
 smtoon smoketestoo_native\data nmake - all smoketestoonative_data NULL
 smtoon smoketestoo_native nmake - all smoketestoonative_mk smoketestoonative_com_sun_star_comp_smoketest smoketestoonative_data NULL
diff --git a/smoketestoo_native/prj/d.lst b/smoketestoo_native/prj/d.lst
index e69de29bb2d1..92eb2818fd2c 100644
--- a/smoketestoo_native/prj/d.lst
+++ b/smoketestoo_native/prj/d.lst
@@ -0,0 +1,3 @@
+..\losmoketest %_DEST%\bin\losmoketest
+..\%__SRC%\bin\smoketestdoc.sxw %_DEST%\bin\smoketestdoc.sxw
+..\%__SRC%\lib\libsmoketest.* %_DEST%\lib\libsmoketest.*
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)