Redid a fix that was messing things up on cbt analysis

Author: TimSVector

src/main/resources/scripts/generate_xml.py

@@ -863,6 +863,7 @@ def runAggregateReport(self,comp,ts,env_name,report_name):
             shutil.copyfile(fname, report_name)
         except:
             traceback.print_exc()
+            
     def skipReporting(self, env):
 
         build_dir = ""
@@ -1016,10 +1017,8 @@ def __init__(self, FullManageProjectName, build_dir, env, compiler, testsuite, c
 
         ## use hash code instead of final directory name as regression scripts can have overlapping final directory names
         build_dir = build_dir.replace("\\","/")
-        
-        # not sure why this was added, but causing issues with a path with /.blah as a path
-        # commenting out for now
-        # build_dir = build_dir.replace("/.","")
+        if build_dir.endswith("/."):
+            build_dir = build_dir.replace("/.","")
         build_dir_4hash = build_dir.upper()
         build_dir_4hash = "/".join(build_dir_4hash.split("/")[-2:])
 
@@ -1086,12 +1085,6 @@ def generate_unit(self):
             print("self.api: ")
             pprint(dump(self.api))
 
-            print("self.api.TestCase.all(): ")
-            try:
-                pprint(self.api.TestCase.all())
-            except:
-                print("error with self.api.TestCase.all() call")
-                
 
         if isinstance(self.api, CoverApi):
             try:
@@ -1133,6 +1126,13 @@ def generate_unit(self):
                 return
 
         else:
+            if self.verbose:
+
+                print("self.api.TestCase.all(): ")
+                try:
+                    pprint(self.api.TestCase.all())
+                except:
+                    print("error with self.api.TestCase.all() call")
             try:
                 self.start_unit_test_file()
                 self.add_compound_tests()

src/main/resources/scripts/parse_console_for_cbt.py

@@ -77,8 +77,8 @@ def parse(self, console_log):
 
         for line in console_log:
             try:
-                lineTime, line = line.split(" ",1)
                 line_dto = datetime.strptime(lineTime,"%H:%M:%S.%f")
+                lineTime, line = line.split(" ",1)
             except:
                 pass