Merge commit '1b3f80127765' from apple/master into swift/master-next

git apple-llvm automerger · git apple-llvm automerger · commit e0130a02d78a · 2019-10-31T11:22:19.000-07:00
diff --git a/debuginfo-tests/dexter/feature_tests/subtools/help/help.test b/debuginfo-tests/dexter/feature_tests/subtools/help/help.test
@@ -1,3 +1,4 @@
+XFAIL: darwin
 Purpose:
     Check the `help` subtool runs.
 
diff --git a/debuginfo-tests/dexter/feature_tests/subtools/list-debuggers/list-debuggers.test b/debuginfo-tests/dexter/feature_tests/subtools/list-debuggers/list-debuggers.test
@@ -1,3 +1,4 @@
+XFAIL: darwin
 Purpose:
     Check the `list-debuggers` subtool runs.
 
diff --git a/debuginfo-tests/dexter/feature_tests/subtools/test/err_paren.cpp b/debuginfo-tests/dexter/feature_tests/subtools/test/err_paren.cpp
@@ -1,3 +1,4 @@
+// XFAIL: darwin
 // Purpose:
 //      Check that parsing bad commands gives a useful error.
 //          - Unbalanced parenthesis
diff --git a/debuginfo-tests/dexter/feature_tests/subtools/test/err_paren_mline.cpp b/debuginfo-tests/dexter/feature_tests/subtools/test/err_paren_mline.cpp
@@ -1,3 +1,4 @@
+// XFAIL: darwin
 // Purpose:
 //      Check that parsing bad commands gives a useful error.
 //          - Unbalanced parenthesis over multiple lines
diff --git a/debuginfo-tests/dexter/feature_tests/subtools/test/err_syntax.cpp b/debuginfo-tests/dexter/feature_tests/subtools/test/err_syntax.cpp
@@ -1,3 +1,4 @@
+// XFAIL: darwin
 // Purpose:
 //      Check that parsing bad commands gives a useful error.
 //          - Syntax error (misplaced ',')
diff --git a/debuginfo-tests/dexter/feature_tests/subtools/test/err_syntax_mline.cpp b/debuginfo-tests/dexter/feature_tests/subtools/test/err_syntax_mline.cpp
@@ -1,3 +1,4 @@
+// XFAIL: darwin
 // Purpose:
 //      Check that parsing bad commands gives a useful error.
 //          - Syntax error (misplaced ',') over multiple lines
diff --git a/debuginfo-tests/dexter/feature_tests/subtools/test/err_type.cpp b/debuginfo-tests/dexter/feature_tests/subtools/test/err_type.cpp
@@ -1,3 +1,4 @@
+// XFAIL: darwin
 // Purpose:
 //      Check that parsing bad commands gives a useful error.
 //          - Type error (missing args)
diff --git a/debuginfo-tests/dexter/feature_tests/subtools/test/err_type_mline.cpp b/debuginfo-tests/dexter/feature_tests/subtools/test/err_type_mline.cpp
@@ -1,3 +1,4 @@
+// XFAIL: darwin
 // Purpose:
 //      Check that parsing bad commands gives a useful error.
 //          - Type error (missing args) over multple lines
diff --git a/debuginfo-tests/dexter/feature_tests/unittests/run.test b/debuginfo-tests/dexter/feature_tests/unittests/run.test
@@ -1,3 +1,4 @@
+XFAIL: darwin
 Purpose:
     Run DExTer unit tests.
 

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+XFAIL: darwin`
`1`	`2`	`Purpose:`
`2`	`3`	Check the `help` subtool runs.
`3`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+// XFAIL: darwin`
`1`	`2`	`// Purpose:`
`2`	`3`	`// Check that parsing bad commands gives a useful error.`
`3`	`4`	`// - Unbalanced parenthesis`