fix unresolved merge conflict

src/feelpp/benchmarking/reframe/commandBuilder.py

@@ -37,7 +37,17 @@ def buildExecutionMode(self):
         else:
             return "-r"
 
-    def buildCommand(self,timeout):
+    def buildJobOptions(self,timeout,memory):
+        #TODO: Generalize (only workf for slurm ?)
+        options = []
+        if timeout:
+            options.append(f"-J time={timeout}")
+        if memory:
+            options.append(f"-J mem={memory}")
+        return " ".join(options)
+
+
+    def buildCommand(self,timeout,memory):
         assert self.report_folder_path is not None, "Report folder path not set"
         cmd = [
             'reframe',
@@ -48,7 +58,7 @@ def buildCommand(self,timeout):
             f'--exec-policy={self.machine_config.execution_policy}',
             f'--prefix={self.machine_config.reframe_base_dir}',
             f'--report-file={str(os.path.join(self.report_folder_path,"reframe_report.json"))}',
-            f"-J '#SBATCH --time={timeout}'",
+            f"{self.buildJobOptions(timeout,memory)}",
             f'--perflogdir={os.path.join(self.machine_config.reframe_base_dir,"logs")}',
             f'{"-"+"v"*self.parser.args.verbose  if self.parser.args.verbose else ""}',
             f'{self.buildExecutionMode()}'