From: Nicolas Geimer <nicolas.geimer@edf.fr>
Date: Tue, 3 Jan 2017 09:13:45 +0000 (+0100)
Subject: Allow 'module' macro of EDF clusters
X-Git-Tag: Before_python3_27062017~2
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=4ad209d86f09393bc0ed3cebde52732ba9b8e281;p=tools%2Flibbatch.git

Allow 'module' macro of EDF clusters

The 'module' macro is used to load libraries and compiler environments
for EDF clusters. This macro is defined in profile so we need a
complete login shell (bash -l) instead of a minimal shell (sh -f).

Signed-off-by: Ovidiu Mircescu <ovidiu.mircescu@edf.fr>
---

diff --git a/src/Slurm/BatchManager_Slurm.cxx b/src/Slurm/BatchManager_Slurm.cxx
index 8199cb5..b768386 100644
--- a/src/Slurm/BatchManager_Slurm.cxx
+++ b/src/Slurm/BatchManager_Slurm.cxx
@@ -124,7 +124,7 @@ namespace Batch {
     ofstream tempOutputFile;
     string tmpFileName = Utils::createAndOpenTemporaryFile("slurm-script", tempOutputFile);
 
-    tempOutputFile << "#!/bin/sh -f" << endl;
+    tempOutputFile << "#!/bin/bash -l" << endl;
     tempOutputFile << "#SBATCH --output=" << workDir << "/logs/output.log." << rootNameToExecute << endl;
     tempOutputFile << "#SBATCH --error=" << workDir << "/logs/error.log." << rootNameToExecute << endl;