Adjust the test data for all test methods

Signed-off-by: Martin Tzvetanov Grigorov <mgrigorov@apache.org>

Author: martin-g

TestCases/TestCase.py

@@ -117,12 +117,7 @@ def run_test(self):
                                            self.cfg_file, 
                                            logfilename)
 
-        if self.cpu_arch == 'aarch64':
-            if len(self.test_vals_aarch64) != 0:
-                self.test_vals = self.test_vals_aarch64
-        
-            if len(self.reference_file_aarch64) != 0:
-                self.reference_file = self.reference_file_aarch64
+        self.adjust_test_data()
 
         # Run SU2
         workdir = os.getcwd()
@@ -253,6 +248,8 @@ def run_filediff(self):
         # Adjust the number of iterations in the config file
         self.adjust_iter()
 
+        self.adjust_test_data()
+
         # if root, add flag to mpirun
         if os.geteuid()==0:
             if self.su2_exec.startswith('mpirun'):
@@ -349,6 +346,8 @@ def run_opt(self):
         # Adjust the number of iterations in the config file   
         self.adjust_opt_iter()
 
+        self.adjust_test_data()
+
         # 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)
@@ -474,6 +473,8 @@ def run_geo(self):
         found_twist  = False
         found_chord  = False
 
+        self.adjust_test_data()
+
         # if root, add flag to mpirun
         if os.geteuid()==0:
             if self.su2_exec.startswith('mpirun'):
@@ -601,6 +602,8 @@ def run_def(self):
         iter_missing = True
         start_solver = True
 
+        self.adjust_test_data()
+
         # if root, add flag to mpirun
         if os.geteuid()==0:
             if self.su2_exec.startswith('mpirun'):
@@ -799,3 +802,12 @@ def is_enabled(self):
             print('Ignoring test "%s" because it is not enabled for the current CPU architecture: %s' % (self.tag, self.cpu_arch))
 
         return is_enabled
+
+    def adjust_test_data(self):
+
+        if self.cpu_arch == 'aarch64':
+            if len(self.test_vals_aarch64) != 0:
+                self.test_vals = self.test_vals_aarch64
+        
+            if len(self.reference_file_aarch64) != 0:
+                self.reference_file = self.reference_file_aarch64