aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Albert <danalbert@google.com>2015-01-09 02:03:07 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-01-09 02:03:07 +0000
commit3c883204585025cedf3d412eec71a184a3a6a1c5 (patch)
tree3fcf4b6ac4093a3036cbe3185a63cb6a1417bd5f
parent414a25aff9c608f702ac356466cf24bf97c91f53 (diff)
parentbb284ab8237de04beef0c9a7ae0fce37be62fc5a (diff)
downloadexternal_llvm-3c883204585025cedf3d412eec71a184a3a6a1c5.zip
external_llvm-3c883204585025cedf3d412eec71a184a3a6a1c5.tar.gz
external_llvm-3c883204585025cedf3d412eec71a184a3a6a1c5.tar.bz2
am bb284ab8: am 04092cf9: Merge "Fix corner cases in lit xunit for paths with dots"
* commit 'bb284ab8237de04beef0c9a7ae0fce37be62fc5a': Fix corner cases in lit xunit for paths with dots
-rw-r--r--utils/lit/lit/Test.py11
1 files changed, 9 insertions, 2 deletions
diff --git a/utils/lit/lit/Test.py b/utils/lit/lit/Test.py
index b6dabe1..7f5d411 100644
--- a/utils/lit/lit/Test.py
+++ b/utils/lit/lit/Test.py
@@ -200,9 +200,16 @@ class Test:
def getJUnitXML(self):
test_name = self.path_in_suite[-1]
test_path = self.path_in_suite[:-1]
+ safe_test_path = [x.replace(".","_") for x in test_path]
safe_name = self.suite.name.replace(".","-")
- xml = "<testcase classname='" + safe_name + "." + \
- "/".join(test_path) + "'" + " name='" + test_name + "'"
+
+ if safe_test_path:
+ class_name = safe_name + "." + "/".join(safe_test_path)
+ else:
+ class_name = safe_name
+
+ xml = "<testcase classname='" + class_name + "' name='" + \
+ test_name + "'"
xml += " time='%.2f'" % (self.result.elapsed,)
if self.result.code.isFailure:
xml += ">\n\t<failure >\n" + escape(self.result.output)