Ensure to pass killall the correct process name.

Author: jblueh

TestCases/TestCase.py

@@ -68,8 +68,10 @@ def __init__(self,tag_in):
         self.cpu_arch = platform.processor()
         self.enabled_on_cpu_arch = ["x86_64", "aarch64"]
 
-        # These can be optionally varied 
-        self.su2_exec    = "SU2_CFD" 
+        # These can be optionally varied
+        self.su2_exec_prefix = ""
+        self.su2_exec        = "SU2_CFD"
+        self.su2_exec_suffix = ""
         self.timeout     = 300
         self.tol         = 0.001
 
@@ -92,8 +94,8 @@ def run_test(self):
 
         # if root, add flag to mpirun
         if os.geteuid()==0:
-            if self.su2_exec.startswith('mpirun'):
-                self.su2_exec = self.su2_exec.replace('mpirun', 'mpirun --allow-run-as-root')
+            if self.su2_exec_prefix.startswith('mpirun'):
+                self.su2_exec_prefix = self.su2_exec_prefix.replace('mpirun', 'mpirun --allow-run-as-root')
 
         # Adjust the number of iterations in the config file
         if len(self.test_vals) != 0:
@@ -111,11 +113,11 @@ def run_test(self):
 
         # Check for polar calls
         if self.polar:
-             command = "%s > %s" % (self.su2_exec, logfilename)
+            command = "%s %s %s > %s" % (self.su2_exec_prefix, self.su2_exec, self.su2_exec_suffix, logfilename)
         else:
-            command = "%s %s > %s 2>&1" % (self.su2_exec, 
-                                           self.cfg_file, 
-                                           logfilename)
+            command = "%s %s %s %s > %s 2>&1" % (self.su2_exec_prefix, self.su2_exec, self.su2_exec_suffix,
+                                                 self.cfg_file,
+                                                 logfilename)
 
         self.adjust_test_data()
 
@@ -252,12 +254,12 @@ def run_filediff(self):
 
         # if root, add flag to mpirun
         if os.geteuid()==0:
-            if self.su2_exec.startswith('mpirun'):
-                self.su2_exec = self.su2_exec.replace('mpirun', 'mpirun --allow-run-as-root')
+            if self.su2_exec_prefix.startswith('mpirun'):
+                self.su2_exec_prefix = self.su2_exec_prefix.replace('mpirun', 'mpirun --allow-run-as-root')
 
         # Assemble the shell command to run
         logfilename = '%s.log' % os.path.splitext(self.cfg_file)[0]
-        command = "%s %s > %s 2>&1" % (self.su2_exec, self.cfg_file, logfilename)
+        command = "%s %s %s %s > %s 2>&1" % (self.su2_exec_prefix, self.su2_exec, self.su2_exec_suffix, self.cfg_file, logfilename)
 
         # Run SU2
         workdir = os.getcwd()
@@ -350,7 +352,7 @@ def run_opt(self):
 
         # Assemble the shell command to run SU2
         logfilename = '%s.log' % os.path.splitext(self.cfg_file)[0]
-        command = "%s %s > %s 2>&1" % (self.su2_exec, self.cfg_file, logfilename)
+        command = "%s %s %s %s > %s 2>&1" % (self.su2_exec_prefix, self.su2_exec, self.su2_exec_suffix, self.cfg_file, logfilename)
 
         # Run SU2
         workdir = os.getcwd()
@@ -477,12 +479,12 @@ def run_geo(self):
 
         # if root, add flag to mpirun
         if os.geteuid()==0:
-            if self.su2_exec.startswith('mpirun'):
-                self.su2_exec = self.su2_exec.replace('mpirun', 'mpirun --allow-run-as-root')
+            if self.su2_exec_prefix.startswith('mpirun'):
+                self.su2_exec_prefix = self.su2_exec_prefix.replace('mpirun', 'mpirun --allow-run-as-root')
 
         # Assemble the shell command to run SU2
         logfilename = '%s.log' % os.path.splitext(self.cfg_file)[0]
-        command = "%s %s > %s 2>&1" % (self.su2_exec, self.cfg_file, logfilename)
+        command = "%s %s %s %s > %s 2>&1" % (self.su2_exec_prefix, self.su2_exec, self.su2_exec_suffix, self.cfg_file, logfilename)
 
         # Run SU2
         workdir = os.getcwd()
@@ -606,12 +608,12 @@ def run_def(self):
 
         # if root, add flag to mpirun
         if os.geteuid()==0:
-            if self.su2_exec.startswith('mpirun'):
-                self.su2_exec = self.su2_exec.replace('mpirun', 'mpirun --allow-run-as-root')
+            if self.su2_exec_prefix.startswith('mpirun'):
+                self.su2_exec_prefix = self.su2_exec_prefix.replace('mpirun', 'mpirun --allow-run-as-root')
 
         # Assemble the shell command to run SU2
         logfilename = '%s.log' % os.path.splitext(self.cfg_file)[0]
-        command = "%s %s > %s 2>&1" % (self.su2_exec, self.cfg_file, logfilename)
+        command = "%s %s %s %s > %s 2>&1" % (self.su2_exec_prefix, self.su2_exec, self.su2_exec_suffix, self.cfg_file, logfilename)
 
         # Run SU2
         workdir = os.getcwd()

TestCases/hybrid_regression.py

@@ -765,7 +765,8 @@ def main():
     pywrapper_translating_naca0012 = TestCase('pywrapper_translating_naca0012')
     pywrapper_translating_naca0012.cfg_dir = "py_wrapper/translating_NACA0012"
     pywrapper_translating_naca0012.cfg_file = "config.cfg"
-    pywrapper_translating_naca0012.su2_exec = "python run_su2.py"
+    pywrapper_translating_naca0012.su2_exec = "python"
+    pywrapper_translating_naca0012.su2_exec_suffix = "run_su2.py"
     pywrapper_translating_naca0012.timeout = 60
     pywrapper_translating_naca0012.reference_file = "forces_0.csv.ref"
     pywrapper_translating_naca0012.reference_file_aarch64 = "forces_0_aarch64.csv.ref"
@@ -778,7 +779,8 @@ def main():
     ######################################
 
     for test in test_list:
-        test.su2_exec = "SU2_CFD -t 2"
+        test.su2_exec = "SU2_CFD"
+        test.su2_exec_suffix = "-t 2"
         test.timeout = 600
         test.tol = 1e-4
     #end

TestCases/hybrid_regression_AD.py

@@ -215,7 +215,8 @@ def main():
     ######################################
 
     for test in test_list:
-        test.su2_exec = "SU2_CFD_AD -t 2"
+        test.su2_exec = "SU2_CFD_AD"
+        test.su2_exec_suffix = "-t 2"
         test.timeout = 600
         test.tol = 1e-4
     #end