diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2017-08-02 03:26:59 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2017-08-02 07:30:01 +0200 |
| commit | 6d2ef60c30893f5b3771ad645b5680ee4081113a (patch) | |
| tree | 838fdddedb87c18a67b098a9e1521b9b77ad185b /desktop | |
| parent | a0c54ff9a6b92d220a1eb7099dd2ecd2bd92056f (diff) | |
updater: make it easier to test indenpendent updater parts
Change-Id: I3f06c6315349c9c53e3e76a8a01153679260c272
Reviewed-on: https://gerrit.libreoffice.org/40653
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/app/app.cxx | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 0e9998d11581..24545b9502d1 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -1383,11 +1383,12 @@ int Desktop::Main() return EXIT_FAILURE; #if HAVE_FEATURE_UPDATE_MAR - const char* pUpdaterTestReplace = std::getenv("LIBO_UPDATER_TEST_REPLACE"); - if (pUpdaterTestReplace || officecfg::Office::Update::Update::Enabled::get()) + const char* pUpdaterTestEnable = std::getenv("LIBO_UPDATER_TEST_ENABLE"); + if (pUpdaterTestEnable || officecfg::Office::Update::Update::Enabled::get()) { // check if we just updated - bool bUpdateRunning = officecfg::Office::Update::Update::UpdateRunning::get(); + const char* pUpdaterRunning = std::getenv("LIBO_UPDATER_TEST_RUNNING"); + bool bUpdateRunning = officecfg::Office::Update::Update::UpdateRunning::get() || pUpdaterRunning; if (bUpdateRunning) { OUString aSeeAlso = officecfg::Office::Update::Update::SeeAlso::get(); @@ -1426,7 +1427,8 @@ int Desktop::Main() osl::DirectoryItem aDirectoryItem; osl::DirectoryItem::get(Updater::getUpdateDirURL(), aDirectoryItem); - if (pUpdaterTestReplace || (aPatchInfo.is() && aDirectoryItem.is())) + const char* pUpdaterTestUpdate = std::getenv("LIBO_UPDATER_TEST_UPDATE"); + if (pUpdaterTestUpdate || (aPatchInfo.is() && aDirectoryItem.is())) { OUString aBuildID("${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE("version") ":buildid}"); rtl::Bootstrap::expandMacros(aBuildID); |