From bd315cdf03f4da48f33eda96e55cc1e537563409 Mon Sep 17 00:00:00 2001 From: Piotr Konopka Date: Fri, 19 Nov 2021 12:27:23 +0100 Subject: [PATCH] AliECS dump: support development setups --- Framework/Core/src/O2ControlHelpers.cxx | 2 +- Framework/Core/test/test_FrameworkDataFlowToO2Control.cxx | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Framework/Core/src/O2ControlHelpers.cxx b/Framework/Core/src/O2ControlHelpers.cxx index 448fd11186328..78eb97d8b0045 100644 --- a/Framework/Core/src/O2ControlHelpers.cxx +++ b/Framework/Core/src/O2ControlHelpers.cxx @@ -323,7 +323,7 @@ void dumpTask(std::ostream& dumpOut, const DeviceSpec& spec, const DeviceExecuti dumpOut << indLevel << indScheme << "_module_cmdline: >-\n"; dumpOut << indLevel << indScheme << indScheme << "source /etc/profile.d/modules.sh && MODULEPATH={{ modulepath }} module load O2 QualityControl Control-OCCPlugin &&\n"; dumpOut << indLevel << indScheme << indScheme << "{{ dpl_command }} | " << execution.args[0] << "\n"; - dumpOut << indLevel << indScheme << "_plain_cmdline: \"source /etc/profile.d/o2.sh && {{ dpl_command }} | " << execution.args[0] << "\"\n"; + dumpOut << indLevel << indScheme << "_plain_cmdline: \"source /etc/profile.d/o2.sh && {{ len(extra_env_vars)>0 ? 'export ' + extra_env_vars + ' &&' : '' }} {{ dpl_command }} | " << execution.args[0] << "\"\n"; dumpOut << indLevel << "control:\n"; dumpOut << indLevel << indScheme << "mode: \"fairmq\"\n"; diff --git a/Framework/Core/test/test_FrameworkDataFlowToO2Control.cxx b/Framework/Core/test/test_FrameworkDataFlowToO2Control.cxx index 598f90c6fc514..bf79a3f0dcc74 100644 --- a/Framework/Core/test/test_FrameworkDataFlowToO2Control.cxx +++ b/Framework/Core/test/test_FrameworkDataFlowToO2Control.cxx @@ -130,7 +130,7 @@ const std::vector expectedTasks{ _module_cmdline: >- source /etc/profile.d/modules.sh && MODULEPATH={{ modulepath }} module load O2 QualityControl Control-OCCPlugin && {{ dpl_command }} | bcsadc/foo - _plain_cmdline: "source /etc/profile.d/o2.sh && {{ dpl_command }} | bcsadc/foo" + _plain_cmdline: "source /etc/profile.d/o2.sh && {{ len(extra_env_vars)>0 ? 'export ' + extra_env_vars + ' &&' : '' }} {{ dpl_command }} | bcsadc/foo" control: mode: "fairmq" wants: @@ -201,7 +201,7 @@ const std::vector expectedTasks{ _module_cmdline: >- source /etc/profile.d/modules.sh && MODULEPATH={{ modulepath }} module load O2 QualityControl Control-OCCPlugin && {{ dpl_command }} | foo - _plain_cmdline: "source /etc/profile.d/o2.sh && {{ dpl_command }} | foo" + _plain_cmdline: "source /etc/profile.d/o2.sh && {{ len(extra_env_vars)>0 ? 'export ' + extra_env_vars + ' &&' : '' }} {{ dpl_command }} | foo" control: mode: "fairmq" wants: @@ -272,7 +272,7 @@ const std::vector expectedTasks{ _module_cmdline: >- source /etc/profile.d/modules.sh && MODULEPATH={{ modulepath }} module load O2 QualityControl Control-OCCPlugin && {{ dpl_command }} | foo - _plain_cmdline: "source /etc/profile.d/o2.sh && {{ dpl_command }} | foo" + _plain_cmdline: "source /etc/profile.d/o2.sh && {{ len(extra_env_vars)>0 ? 'export ' + extra_env_vars + ' &&' : '' }} {{ dpl_command }} | foo" control: mode: "fairmq" wants: @@ -343,7 +343,7 @@ const std::vector expectedTasks{ _module_cmdline: >- source /etc/profile.d/modules.sh && MODULEPATH={{ modulepath }} module load O2 QualityControl Control-OCCPlugin && {{ dpl_command }} | foo - _plain_cmdline: "source /etc/profile.d/o2.sh && {{ dpl_command }} | foo" + _plain_cmdline: "source /etc/profile.d/o2.sh && {{ len(extra_env_vars)>0 ? 'export ' + extra_env_vars + ' &&' : '' }} {{ dpl_command }} | foo" control: mode: "fairmq" wants: