Merge remote-tracking branch 'origin/swift-4.1-branch' into stable
diff --git a/test/ubsan_minimal/lit.common.cfg b/test/ubsan_minimal/lit.common.cfg
index 9d2ef1d..e8b42bb 100644
--- a/test/ubsan_minimal/lit.common.cfg
+++ b/test/ubsan_minimal/lit.common.cfg
@@ -13,6 +13,7 @@
 
 # Setup source root.
 config.test_source_root = os.path.dirname(__file__)
+config.name = 'UBSan-Minimal-' + config.target_arch
 
 def build_invocation(compile_flags):
   return " " + " ".join([config.clang] + compile_flags) + " "