Default to two iterations with the thread sanitizer.

Author: jblueh

TestCases/TestCase.py

@@ -142,7 +142,7 @@ def run_test(self, running_with_tsan=False):
 
         # Adjust the number of iterations in the config file
         if len(self.test_vals) != 0:
-            self.adjust_iter()
+            self.adjust_iter(running_with_tsan)
 
         # Check for disabling the restart
         if self.no_restart:
@@ -291,7 +291,7 @@ def run_filediff(self, running_with_tsan=False):
         timed_out    = False
 
         # Adjust the number of iterations in the config file
-        self.adjust_iter()
+        self.adjust_iter(running_with_tsan)
 
         self.adjust_test_data()
 
@@ -850,7 +850,12 @@ def run_def(self):
         os.chdir(workdir)
         return passed
 
-    def adjust_iter(self):
+    def adjust_iter(self, running_with_tsan=False):
+
+        if not running_with_tsan:
+          new_iter = self.test_iter + 1
+        else:
+          new_iter = 2
 
         # Read the cfg file
         workdir = os.getcwd()
@@ -863,7 +868,7 @@ def adjust_iter(self):
         self.cfg_file = "%s.autotest"%self.cfg_file
         file_out = open(self.cfg_file,'w')
         file_out.write('% This file automatically generated by the regression script\n')
-        file_out.write('%% Number of iterations changed to %d\n'%(self.test_iter+1))
+        file_out.write('%% Number of iterations changed to %d\n'%(new_iter))
         if (self.multizone or self.new_output) and self.unsteady:
             adjust_string = "TIME_ITER"
         elif self.multizone:
@@ -874,7 +879,7 @@ def adjust_iter(self):
             if not line.strip().split("=")[0].strip() == adjust_string:
                 file_out.write(line)
             else:
-                file_out.write(adjust_string+"=%d\n"%(self.test_iter+1))
+                file_out.write(adjust_string+"=%d\n"%(new_iter))
         file_out.close()
         os.chdir(workdir)