185 files changed, 167 insertions, 170 deletions

diff --git a/test/YAMLParser/bool.data b/test/YAMLParser/bool.test
index e987a0ec1e326..e987a0ec1e326 100644
--- a/test/YAMLParser/bool.data
+++ b/test/YAMLParser/bool.test
diff --git a/test/YAMLParser/construct-bool.data b/test/YAMLParser/construct-bool.test
index 035ec0c858050..035ec0c858050 100644
--- a/test/YAMLParser/construct-bool.data
+++ b/test/YAMLParser/construct-bool.test
diff --git a/test/YAMLParser/construct-custom.data b/test/YAMLParser/construct-custom.test
index cac95e0a5fb7c..cac95e0a5fb7c 100644
--- a/test/YAMLParser/construct-custom.data
+++ b/test/YAMLParser/construct-custom.test
diff --git a/test/YAMLParser/construct-float.data b/test/YAMLParser/construct-float.test
index 07c51bdd833b9..07c51bdd833b9 100644
--- a/test/YAMLParser/construct-float.data
+++ b/test/YAMLParser/construct-float.test
diff --git a/test/YAMLParser/construct-int.data b/test/YAMLParser/construct-int.test
index b14c37f7880e6..b14c37f7880e6 100644
--- a/test/YAMLParser/construct-int.data
+++ b/test/YAMLParser/construct-int.test
diff --git a/test/YAMLParser/construct-map.data b/test/YAMLParser/construct-map.test
index 1b681206d177f..1b681206d177f 100644
--- a/test/YAMLParser/construct-map.data
+++ b/test/YAMLParser/construct-map.test
diff --git a/test/YAMLParser/construct-merge.data b/test/YAMLParser/construct-merge.test
index 0ebc9f612d5db..0ebc9f612d5db 100644
--- a/test/YAMLParser/construct-merge.data
+++ b/test/YAMLParser/construct-merge.test
diff --git a/test/YAMLParser/construct-null.data b/test/YAMLParser/construct-null.test
index 51f8b61e24ef2..51f8b61e24ef2 100644
--- a/test/YAMLParser/construct-null.data
+++ b/test/YAMLParser/construct-null.test
diff --git a/test/YAMLParser/construct-omap.data b/test/YAMLParser/construct-omap.test
index b96d6799c7d4f..b96d6799c7d4f 100644
--- a/test/YAMLParser/construct-omap.data
+++ b/test/YAMLParser/construct-omap.test
diff --git a/test/YAMLParser/construct-pairs.data b/test/YAMLParser/construct-pairs.test
index 40f288d1d741d..40f288d1d741d 100644
--- a/test/YAMLParser/construct-pairs.data
+++ b/test/YAMLParser/construct-pairs.test
diff --git a/test/YAMLParser/construct-seq.data b/test/YAMLParser/construct-seq.test
index f43fd39f8ed20..f43fd39f8ed20 100644
--- a/test/YAMLParser/construct-seq.data
+++ b/test/YAMLParser/construct-seq.test
diff --git a/test/YAMLParser/construct-set.data b/test/YAMLParser/construct-set.test
index 3e9d095e714e3..3e9d095e714e3 100644
--- a/test/YAMLParser/construct-set.data
+++ b/test/YAMLParser/construct-set.test
diff --git a/test/YAMLParser/construct-str-ascii.data b/test/YAMLParser/construct-str-ascii.test
index 24290ae8a99c4..24290ae8a99c4 100644
--- a/test/YAMLParser/construct-str-ascii.data
+++ b/test/YAMLParser/construct-str-ascii.test
diff --git a/test/YAMLParser/construct-str.data b/test/YAMLParser/construct-str.test
index dc1ce825cdc82..dc1ce825cdc82 100644
--- a/test/YAMLParser/construct-str.data
+++ b/test/YAMLParser/construct-str.test
diff --git a/test/YAMLParser/construct-timestamp.data b/test/YAMLParser/construct-timestamp.test
index f262c2d02c0d3..f262c2d02c0d3 100644
--- a/test/YAMLParser/construct-timestamp.data
+++ b/test/YAMLParser/construct-timestamp.test
diff --git a/test/YAMLParser/construct-value.data b/test/YAMLParser/construct-value.test
index fe01a0dc9049e..fe01a0dc9049e 100644
--- a/test/YAMLParser/construct-value.data
+++ b/test/YAMLParser/construct-value.test
diff --git a/test/YAMLParser/duplicate-key.former-loader-error.data b/test/YAMLParser/duplicate-key.former-loader-error.test
index 9272103fe6570..9272103fe6570 100644
--- a/test/YAMLParser/duplicate-key.former-loader-error.data
+++ b/test/YAMLParser/duplicate-key.former-loader-error.test
diff --git a/test/YAMLParser/duplicate-mapping-key.former-loader-error.data b/test/YAMLParser/duplicate-mapping-key.former-loader-error.test
index 96d175d2ac1ab..96d175d2ac1ab 100644
--- a/test/YAMLParser/duplicate-mapping-key.former-loader-error.data
+++ b/test/YAMLParser/duplicate-mapping-key.former-loader-error.test
diff --git a/test/YAMLParser/duplicate-merge-key.former-loader-error.data b/test/YAMLParser/duplicate-merge-key.former-loader-error.test
index 6b1276436ab14..6b1276436ab14 100644
--- a/test/YAMLParser/duplicate-merge-key.former-loader-error.data
+++ b/test/YAMLParser/duplicate-merge-key.former-loader-error.test
diff --git a/test/YAMLParser/duplicate-value-key.former-loader-error.data b/test/YAMLParser/duplicate-value-key.former-loader-error.test
index dc20e0b275c68..dc20e0b275c68 100644
--- a/test/YAMLParser/duplicate-value-key.former-loader-error.data
+++ b/test/YAMLParser/duplicate-value-key.former-loader-error.test
diff --git a/test/YAMLParser/emit-block-scalar-in-simple-key-context-bug.data b/test/YAMLParser/emit-block-scalar-in-simple-key-context-bug.test
index f5adedb1350fe..f5adedb1350fe 100644
--- a/test/YAMLParser/emit-block-scalar-in-simple-key-context-bug.data
+++ b/test/YAMLParser/emit-block-scalar-in-simple-key-context-bug.test
diff --git a/test/YAMLParser/empty-document-bug.data b/test/YAMLParser/empty-document-bug.test
index fa131fe78efe2..fa131fe78efe2 100644
--- a/test/YAMLParser/empty-document-bug.data
+++ b/test/YAMLParser/empty-document-bug.test
diff --git a/test/YAMLParser/float.data b/test/YAMLParser/float.test
index c4de97037c83a..c4de97037c83a 100644
--- a/test/YAMLParser/float.data
+++ b/test/YAMLParser/float.test
diff --git a/test/YAMLParser/int.data b/test/YAMLParser/int.test
index 2651d096ff60a..2651d096ff60a 100644
--- a/test/YAMLParser/int.data
+++ b/test/YAMLParser/int.test
diff --git a/test/YAMLParser/invalid-single-quote-bug.data b/test/YAMLParser/invalid-single-quote-bug.test
index 3722a003dfff5..3722a003dfff5 100644
--- a/test/YAMLParser/invalid-single-quote-bug.data
+++ b/test/YAMLParser/invalid-single-quote-bug.test
diff --git a/test/YAMLParser/merge.data b/test/YAMLParser/merge.test
index 86313596e198b..86313596e198b 100644
--- a/test/YAMLParser/merge.data
+++ b/test/YAMLParser/merge.test
diff --git a/test/YAMLParser/more-floats.data b/test/YAMLParser/more-floats.test
index 668b31cd13ae1..668b31cd13ae1 100644
--- a/test/YAMLParser/more-floats.data
+++ b/test/YAMLParser/more-floats.test
diff --git a/test/YAMLParser/negative-float-bug.data b/test/YAMLParser/negative-float-bug.test
index 0ba0ffee30109..0ba0ffee30109 100644
--- a/test/YAMLParser/negative-float-bug.data
+++ b/test/YAMLParser/negative-float-bug.test
diff --git a/test/YAMLParser/null.data b/test/YAMLParser/null.test
index a38d7fa6c5229..a38d7fa6c5229 100644
--- a/test/YAMLParser/null.data
+++ b/test/YAMLParser/null.test
diff --git a/test/YAMLParser/resolver.data b/test/YAMLParser/resolver.test
index 8cbba6328b686..8cbba6328b686 100644
--- a/test/YAMLParser/resolver.data
+++ b/test/YAMLParser/resolver.test
diff --git a/test/YAMLParser/run-parser-crash-bug.data b/test/YAMLParser/run-parser-crash-bug.test
index 3ec910ce0477f..3ec910ce0477f 100644
--- a/test/YAMLParser/run-parser-crash-bug.data
+++ b/test/YAMLParser/run-parser-crash-bug.test
diff --git a/test/YAMLParser/scan-document-end-bug.data b/test/YAMLParser/scan-document-end-bug.test
index 7354caf8cd8bb..7354caf8cd8bb 100644
--- a/test/YAMLParser/scan-document-end-bug.data
+++ b/test/YAMLParser/scan-document-end-bug.test
diff --git a/test/YAMLParser/scan-line-break-bug.data b/test/YAMLParser/scan-line-break-bug.test
index 792973d3f56ca..792973d3f56ca 100644
--- a/test/YAMLParser/scan-line-break-bug.data
+++ b/test/YAMLParser/scan-line-break-bug.test
diff --git a/test/YAMLParser/single-dot-is-not-float-bug.data b/test/YAMLParser/single-dot-is-not-float-bug.test
index 810a5936a894c..810a5936a894c 100644
--- a/test/YAMLParser/single-dot-is-not-float-bug.data
+++ b/test/YAMLParser/single-dot-is-not-float-bug.test
diff --git a/test/YAMLParser/sloppy-indentation.data b/test/YAMLParser/sloppy-indentation.test
index 2b2b62b14afab..2b2b62b14afab 100644
--- a/test/YAMLParser/sloppy-indentation.data
+++ b/test/YAMLParser/sloppy-indentation.test
diff --git a/test/YAMLParser/spec-02-01.data b/test/YAMLParser/spec-02-01.test
index dd15b2bc26a15..dd15b2bc26a15 100644
--- a/test/YAMLParser/spec-02-01.data
+++ b/test/YAMLParser/spec-02-01.test
diff --git a/test/YAMLParser/spec-02-02.data b/test/YAMLParser/spec-02-02.test
index a5695d5c27a50..a5695d5c27a50 100644
--- a/test/YAMLParser/spec-02-02.data
+++ b/test/YAMLParser/spec-02-02.test
diff --git a/test/YAMLParser/spec-02-03.data b/test/YAMLParser/spec-02-03.test
index 81f8d991f746f..81f8d991f746f 100644
--- a/test/YAMLParser/spec-02-03.data
+++ b/test/YAMLParser/spec-02-03.test
diff --git a/test/YAMLParser/spec-02-04.data b/test/YAMLParser/spec-02-04.test
index 44a218d5926b4..44a218d5926b4 100644
--- a/test/YAMLParser/spec-02-04.data
+++ b/test/YAMLParser/spec-02-04.test
diff --git a/test/YAMLParser/spec-02-05.data b/test/YAMLParser/spec-02-05.test
index c9a4a7572f7ae..c9a4a7572f7ae 100644
--- a/test/YAMLParser/spec-02-05.data
+++ b/test/YAMLParser/spec-02-05.test
diff --git a/test/YAMLParser/spec-02-06.data b/test/YAMLParser/spec-02-06.test
index 85c1e2bab8c4c..85c1e2bab8c4c 100644
--- a/test/YAMLParser/spec-02-06.data
+++ b/test/YAMLParser/spec-02-06.test
diff --git a/test/YAMLParser/spec-02-07.data b/test/YAMLParser/spec-02-07.test
index c349662a98ac7..c349662a98ac7 100644
--- a/test/YAMLParser/spec-02-07.data
+++ b/test/YAMLParser/spec-02-07.test
diff --git a/test/YAMLParser/spec-02-08.data b/test/YAMLParser/spec-02-08.test
index 9746a43788a52..9746a43788a52 100644
--- a/test/YAMLParser/spec-02-08.data
+++ b/test/YAMLParser/spec-02-08.test
diff --git a/test/YAMLParser/spec-02-09.data b/test/YAMLParser/spec-02-09.test
index 6aef9333799a4..6aef9333799a4 100644
--- a/test/YAMLParser/spec-02-09.data
+++ b/test/YAMLParser/spec-02-09.test
diff --git a/test/YAMLParser/spec-02-10.data b/test/YAMLParser/spec-02-10.test
index 0302fa750099d..0302fa750099d 100644
--- a/test/YAMLParser/spec-02-10.data
+++ b/test/YAMLParser/spec-02-10.test
diff --git a/test/YAMLParser/spec-02-11.data b/test/YAMLParser/spec-02-11.test
index d8cf863b2c1e0..d8cf863b2c1e0 100644
--- a/test/YAMLParser/spec-02-11.data
+++ b/test/YAMLParser/spec-02-11.test
diff --git a/test/YAMLParser/spec-02-12.data b/test/YAMLParser/spec-02-12.test
index 3b4d5370a9391..3b4d5370a9391 100644
--- a/test/YAMLParser/spec-02-12.data
+++ b/test/YAMLParser/spec-02-12.test
diff --git a/test/YAMLParser/spec-02-13.data b/test/YAMLParser/spec-02-13.test
index 2bbccbf5d7ded..2bbccbf5d7ded 100644
--- a/test/YAMLParser/spec-02-13.data
+++ b/test/YAMLParser/spec-02-13.test
diff --git a/test/YAMLParser/spec-02-14.data b/test/YAMLParser/spec-02-14.test
index 5a18ea213e6cc..5a18ea213e6cc 100644
--- a/test/YAMLParser/spec-02-14.data
+++ b/test/YAMLParser/spec-02-14.test
diff --git a/test/YAMLParser/spec-02-15.data b/test/YAMLParser/spec-02-15.test
index 2a7fbe96ad409..2a7fbe96ad409 100644
--- a/test/YAMLParser/spec-02-15.data
+++ b/test/YAMLParser/spec-02-15.test
diff --git a/test/YAMLParser/spec-02-16.data b/test/YAMLParser/spec-02-16.test
index 3a5792c76320e..3a5792c76320e 100644
--- a/test/YAMLParser/spec-02-16.data
+++ b/test/YAMLParser/spec-02-16.test
diff --git a/test/YAMLParser/spec-02-17.data b/test/YAMLParser/spec-02-17.test
index 2bcb60c8d933b..2bcb60c8d933b 100644
--- a/test/YAMLParser/spec-02-17.data
+++ b/test/YAMLParser/spec-02-17.test
diff --git a/test/YAMLParser/spec-02-18.data b/test/YAMLParser/spec-02-18.test
index 625a4962e9974..625a4962e9974 100644
--- a/test/YAMLParser/spec-02-18.data
+++ b/test/YAMLParser/spec-02-18.test
diff --git a/test/YAMLParser/spec-02-19.data b/test/YAMLParser/spec-02-19.test
index cb9df6dd1f433..cb9df6dd1f433 100644
--- a/test/YAMLParser/spec-02-19.data
+++ b/test/YAMLParser/spec-02-19.test
diff --git a/test/YAMLParser/spec-02-20.data b/test/YAMLParser/spec-02-20.test
index ed147986119d5..ed147986119d5 100644
--- a/test/YAMLParser/spec-02-20.data
+++ b/test/YAMLParser/spec-02-20.test
diff --git a/test/YAMLParser/spec-02-21.data b/test/YAMLParser/spec-02-21.test
index ea979db065b1a..ea979db065b1a 100644
--- a/test/YAMLParser/spec-02-21.data
+++ b/test/YAMLParser/spec-02-21.test
diff --git a/test/YAMLParser/spec-02-22.data b/test/YAMLParser/spec-02-22.test
index 77724f71066e7..77724f71066e7 100644
--- a/test/YAMLParser/spec-02-22.data
+++ b/test/YAMLParser/spec-02-22.test
diff --git a/test/YAMLParser/spec-02-23.data b/test/YAMLParser/spec-02-23.test
index d08dfa755c6b0..d08dfa755c6b0 100644
--- a/test/YAMLParser/spec-02-23.data
+++ b/test/YAMLParser/spec-02-23.test
diff --git a/test/YAMLParser/spec-02-24.data b/test/YAMLParser/spec-02-24.test
index 56b25cbbd80d5..56b25cbbd80d5 100644
--- a/test/YAMLParser/spec-02-24.data
+++ b/test/YAMLParser/spec-02-24.test
diff --git a/test/YAMLParser/spec-02-25.data b/test/YAMLParser/spec-02-25.test
index fbadfda97e362..fbadfda97e362 100644
--- a/test/YAMLParser/spec-02-25.data
+++ b/test/YAMLParser/spec-02-25.test
diff --git a/test/YAMLParser/spec-02-26.data b/test/YAMLParser/spec-02-26.test
index 257108e7e0431..257108e7e0431 100644
--- a/test/YAMLParser/spec-02-26.data
+++ b/test/YAMLParser/spec-02-26.test
diff --git a/test/YAMLParser/spec-02-27.data b/test/YAMLParser/spec-02-27.test
index a190ff19db0b7..a190ff19db0b7 100644
--- a/test/YAMLParser/spec-02-27.data
+++ b/test/YAMLParser/spec-02-27.test
diff --git a/test/YAMLParser/spec-02-28.data b/test/YAMLParser/spec-02-28.test
index 695c27f5d55ad..695c27f5d55ad 100644
--- a/test/YAMLParser/spec-02-28.data
+++ b/test/YAMLParser/spec-02-28.test
diff --git a/test/YAMLParser/spec-05-01-utf8.data b/test/YAMLParser/spec-05-01-utf8.test
index 349da06fab267..349da06fab267 100644
--- a/test/YAMLParser/spec-05-01-utf8.data
+++ b/test/YAMLParser/spec-05-01-utf8.test
diff --git a/test/YAMLParser/spec-05-02-utf8.data b/test/YAMLParser/spec-05-02-utf8.test
index 028f41bb557c2..3666f990e47f0 100644
--- a/test/YAMLParser/spec-05-02-utf8.data
+++ b/test/YAMLParser/spec-05-02-utf8.test
@@ -1,4 +1,4 @@
-# RUN: yaml-bench -canonical %s 2>&1 | FileCheck %s
+# RUN: not yaml-bench -canonical %s 2>&1 | FileCheck %s
 
 # Invalid use of BOM
 # inside a
diff --git a/test/YAMLParser/spec-05-03.data b/test/YAMLParser/spec-05-03.test
index 461e98d2c2b8a..461e98d2c2b8a 100644
--- a/test/YAMLParser/spec-05-03.data
+++ b/test/YAMLParser/spec-05-03.test
diff --git a/test/YAMLParser/spec-05-04.data b/test/YAMLParser/spec-05-04.test
index 52850f435bf54..52850f435bf54 100644
--- a/test/YAMLParser/spec-05-04.data
+++ b/test/YAMLParser/spec-05-04.test
diff --git a/test/YAMLParser/spec-05-05.data b/test/YAMLParser/spec-05-05.test
index 499ee8ffb8ffe..499ee8ffb8ffe 100644
--- a/test/YAMLParser/spec-05-05.data
+++ b/test/YAMLParser/spec-05-05.test
diff --git a/test/YAMLParser/spec-05-06.data b/test/YAMLParser/spec-05-06.test
index 729141acf4b34..729141acf4b34 100644
--- a/test/YAMLParser/spec-05-06.data
+++ b/test/YAMLParser/spec-05-06.test
diff --git a/test/YAMLParser/spec-05-07.data b/test/YAMLParser/spec-05-07.test
index fc80a0d4152ee..fc80a0d4152ee 100644
--- a/test/YAMLParser/spec-05-07.data
+++ b/test/YAMLParser/spec-05-07.test
diff --git a/test/YAMLParser/spec-05-08.data b/test/YAMLParser/spec-05-08.test
index 9f2b7ece53fc8..9f2b7ece53fc8 100644
--- a/test/YAMLParser/spec-05-08.data
+++ b/test/YAMLParser/spec-05-08.test
diff --git a/test/YAMLParser/spec-05-09.data b/test/YAMLParser/spec-05-09.test
index fc061fb2982eb..fc061fb2982eb 100644
--- a/test/YAMLParser/spec-05-09.data
+++ b/test/YAMLParser/spec-05-09.test
diff --git a/test/YAMLParser/spec-05-10.data b/test/YAMLParser/spec-05-10.test
index bab2c1b89ca37..14112c1eed502 100644
--- a/test/YAMLParser/spec-05-10.data
+++ b/test/YAMLParser/spec-05-10.test
@@ -1,4 +1,4 @@
-# RUN: yaml-bench -canonical %s 2>&1 | FileCheck %s
+# RUN: not yaml-bench -canonical %s 2>&1 | FileCheck %s
 
 commercial-at: @text
 grave-accent: `text
diff --git a/test/YAMLParser/spec-05-11.data b/test/YAMLParser/spec-05-11.test
index 7cba5562d5fbf..7cba5562d5fbf 100644
--- a/test/YAMLParser/spec-05-11.data
+++ b/test/YAMLParser/spec-05-11.test
diff --git a/test/YAMLParser/spec-05-12.data b/test/YAMLParser/spec-05-12.test
index eedfc08cf38ac..7ecc36dee8bf7 100644
--- a/test/YAMLParser/spec-05-12.data
+++ b/test/YAMLParser/spec-05-12.test
@@ -1,7 +1,8 @@
 # RUN: yaml-bench -canonical %s 2>&1 | FileCheck %s
 #
+# FIXME: This test should actually fail. Yaml-bench should report an error
+# that a tab is being used to indent a plain scalar at line 15.
 # We don't currently reject tabs as indentation.
-# XFAIL: *
 
 # Tabs do's and don'ts:
 # comment:
@@ -13,4 +14,5 @@ block: |
 elsewhere:	# separation
 	indentation, in	plain scalar
 
-# CHECK: error
+
+# CHECK: !!str "Quoted\t\t"
diff --git a/test/YAMLParser/spec-05-13.data b/test/YAMLParser/spec-05-13.test
index db62e866a755a..db62e866a755a 100644
--- a/test/YAMLParser/spec-05-13.data
+++ b/test/YAMLParser/spec-05-13.test
diff --git a/test/YAMLParser/spec-05-14.data b/test/YAMLParser/spec-05-14.test
index 65451651b69e9..65451651b69e9 100644
--- a/test/YAMLParser/spec-05-14.data
+++ b/test/YAMLParser/spec-05-14.test
diff --git a/test/YAMLParser/spec-05-15.data b/test/YAMLParser/spec-05-15.data
deleted file mode 100644
index 27dbd8396eaa6..0000000000000
--- a/test/YAMLParser/spec-05-15.data
+++ /dev/null
@@ -1,7 +0,0 @@
-# RUN: yaml-bench -canonical %s 2>&1 | FileCheck %s
-
-Bad escapes:
-  "\c
-  \xq-"
-
-# CHECK: error
diff --git a/test/YAMLParser/spec-05-15.test b/test/YAMLParser/spec-05-15.test
new file mode 100644
index 0000000000000..46228bae215e9
--- /dev/null
+++ b/test/YAMLParser/spec-05-15.test
@@ -0,0 +1,7 @@
+# RUN: not yaml-bench -canonical %s 2>&1 | FileCheck %s
+
+Bad escapes:
+  "\c
+  \xq-"
+
+# CHECK: error
diff --git a/test/YAMLParser/spec-06-01.data b/test/YAMLParser/spec-06-01.test
index 95b26bdb3856f..95b26bdb3856f 100644
--- a/test/YAMLParser/spec-06-01.data
+++ b/test/YAMLParser/spec-06-01.test
diff --git a/test/YAMLParser/spec-06-02.data b/test/YAMLParser/spec-06-02.test
index 40a15c9f3ea24..40a15c9f3ea24 100644
--- a/test/YAMLParser/spec-06-02.data
+++ b/test/YAMLParser/spec-06-02.test
diff --git a/test/YAMLParser/spec-06-03.data b/test/YAMLParser/spec-06-03.test
index c1893ef083241..c1893ef083241 100644
--- a/test/YAMLParser/spec-06-03.data
+++ b/test/YAMLParser/spec-06-03.test
diff --git a/test/YAMLParser/spec-06-04.data b/test/YAMLParser/spec-06-04.test
index b61bcc6b95515..b61bcc6b95515 100644
--- a/test/YAMLParser/spec-06-04.data
+++ b/test/YAMLParser/spec-06-04.test
diff --git a/test/YAMLParser/spec-06-05.data b/test/YAMLParser/spec-06-05.test
index 4bcaa5a818933..4bcaa5a818933 100644
--- a/test/YAMLParser/spec-06-05.data
+++ b/test/YAMLParser/spec-06-05.test
diff --git a/test/YAMLParser/spec-06-06.data b/test/YAMLParser/spec-06-06.test
index 67e39ddf89964..67e39ddf89964 100644
--- a/test/YAMLParser/spec-06-06.data
+++ b/test/YAMLParser/spec-06-06.test
diff --git a/test/YAMLParser/spec-06-07.data b/test/YAMLParser/spec-06-07.test
index 451bd349e3efd..451bd349e3efd 100644
--- a/test/YAMLParser/spec-06-07.data
+++ b/test/YAMLParser/spec-06-07.test
diff --git a/test/YAMLParser/spec-06-08.data b/test/YAMLParser/spec-06-08.test
index aa06f847ea361..aa06f847ea361 100644
--- a/test/YAMLParser/spec-06-08.data
+++ b/test/YAMLParser/spec-06-08.test
diff --git a/test/YAMLParser/spec-07-01.data b/test/YAMLParser/spec-07-01.test
index 21bc5e59d59c6..21bc5e59d59c6 100644
--- a/test/YAMLParser/spec-07-01.data
+++ b/test/YAMLParser/spec-07-01.test
diff --git a/test/YAMLParser/spec-07-02.data b/test/YAMLParser/spec-07-02.test
index bf0e758c880c9..bf0e758c880c9 100644
--- a/test/YAMLParser/spec-07-02.data
+++ b/test/YAMLParser/spec-07-02.test
diff --git a/test/YAMLParser/spec-07-03.data b/test/YAMLParser/spec-07-03.data
deleted file mode 100644
index c4a5299562a41..0000000000000
--- a/test/YAMLParser/spec-07-03.data
+++ /dev/null
@@ -1,7 +0,0 @@
-# RUN: yaml-bench -canonical %s 2>&1 | FileCheck %s
-
-%YAML 1.1
-%YAML 1.1
-foo
-
-# CHECK: error
diff --git a/test/YAMLParser/spec-07-03.test b/test/YAMLParser/spec-07-03.test
new file mode 100644
index 0000000000000..76266b896d7a5
--- /dev/null
+++ b/test/YAMLParser/spec-07-03.test
@@ -0,0 +1,7 @@
+# RUN: not yaml-bench -canonical %s 2>&1 | FileCheck %s
+
+%YAML 1.1
+%YAML 1.1
+foo
+
+# CHECK: error
diff --git a/test/YAMLParser/spec-07-04.data b/test/YAMLParser/spec-07-04.test
index 2c8b2ec6959cc..2c8b2ec6959cc 100644
--- a/test/YAMLParser/spec-07-04.data
+++ b/test/YAMLParser/spec-07-04.test
diff --git a/test/YAMLParser/spec-07-05.data b/test/YAMLParser/spec-07-05.data
deleted file mode 100644
index f7cff3a8390c9..0000000000000
--- a/test/YAMLParser/spec-07-05.data
+++ /dev/null
@@ -1,10 +0,0 @@
-# RUN: yaml-bench -canonical %s 2>&1 | FileCheck %s
-#
-# We don't currently parse TAG directives.
-# XFAIL: *
-
-%TAG ! !foo
-%TAG ! !foo
-bar
-
-# CHECK: error
diff --git a/test/YAMLParser/spec-07-05.test b/test/YAMLParser/spec-07-05.test
new file mode 100644
index 0000000000000..447cba81902cc
--- /dev/null
+++ b/test/YAMLParser/spec-07-05.test
@@ -0,0 +1,8 @@
+# RUN: not yaml-bench -canonical %s 2>&1 | FileCheck %s
+#
+# We don't currently parse TAG directives.
+# CHECK: error: Unexpected token
+
+%TAG ! !foo
+%TAG ! !foo
+bar
diff --git a/test/YAMLParser/spec-07-06.data b/test/YAMLParser/spec-07-06.test
index 9f27f91f31111..9f27f91f31111 100644
--- a/test/YAMLParser/spec-07-06.data
+++ b/test/YAMLParser/spec-07-06.test
diff --git a/test/YAMLParser/spec-07-07a.data b/test/YAMLParser/spec-07-07a.test
index e51f8f7d69474..e51f8f7d69474 100644
--- a/test/YAMLParser/spec-07-07a.data
+++ b/test/YAMLParser/spec-07-07a.test
diff --git a/test/YAMLParser/spec-07-07b.data b/test/YAMLParser/spec-07-07b.test
index 003d5755726bf..003d5755726bf 100644
--- a/test/YAMLParser/spec-07-07b.data
+++ b/test/YAMLParser/spec-07-07b.test
diff --git a/test/YAMLParser/spec-07-08.data b/test/YAMLParser/spec-07-08.test
index 7197404b3849f..7197404b3849f 100644
--- a/test/YAMLParser/spec-07-08.data
+++ b/test/YAMLParser/spec-07-08.test
diff --git a/test/YAMLParser/spec-07-09.data b/test/YAMLParser/spec-07-09.test
index 1f98ba0414683..1f98ba0414683 100644
--- a/test/YAMLParser/spec-07-09.data
+++ b/test/YAMLParser/spec-07-09.test
diff --git a/test/YAMLParser/spec-07-10.data b/test/YAMLParser/spec-07-10.test
index a1766834781a8..a1766834781a8 100644
--- a/test/YAMLParser/spec-07-10.data
+++ b/test/YAMLParser/spec-07-10.test
diff --git a/test/YAMLParser/spec-07-11.data b/test/YAMLParser/spec-07-11.test
index ce14b7ebe4dcf..ce14b7ebe4dcf 100644
--- a/test/YAMLParser/spec-07-11.data
+++ b/test/YAMLParser/spec-07-11.test
diff --git a/test/YAMLParser/spec-07-12a.data b/test/YAMLParser/spec-07-12a.test
index 7327f8188e0b5..7327f8188e0b5 100644
--- a/test/YAMLParser/spec-07-12a.data
+++ b/test/YAMLParser/spec-07-12a.test
diff --git a/test/YAMLParser/spec-07-12b.data b/test/YAMLParser/spec-07-12b.test
index d759abea7d443..d759abea7d443 100644
--- a/test/YAMLParser/spec-07-12b.data
+++ b/test/YAMLParser/spec-07-12b.test
diff --git a/test/YAMLParser/spec-07-13.data b/test/YAMLParser/spec-07-13.test
index ab74df1018724..ab74df1018724 100644
--- a/test/YAMLParser/spec-07-13.data
+++ b/test/YAMLParser/spec-07-13.test
diff --git a/test/YAMLParser/spec-08-01.data b/test/YAMLParser/spec-08-01.test
index 5abbfa809491b..5abbfa809491b 100644
--- a/test/YAMLParser/spec-08-01.data
+++ b/test/YAMLParser/spec-08-01.test
diff --git a/test/YAMLParser/spec-08-02.data b/test/YAMLParser/spec-08-02.test
index 8a75783a70954..8a75783a70954 100644
--- a/test/YAMLParser/spec-08-02.data
+++ b/test/YAMLParser/spec-08-02.test
diff --git a/test/YAMLParser/spec-08-03.data b/test/YAMLParser/spec-08-03.test
index 8c715305a810f..8c715305a810f 100644
--- a/test/YAMLParser/spec-08-03.data
+++ b/test/YAMLParser/spec-08-03.test
diff --git a/test/YAMLParser/spec-08-04.data b/test/YAMLParser/spec-08-04.data
deleted file mode 100644
index 73c493d76379c..0000000000000
--- a/test/YAMLParser/spec-08-04.data
+++ /dev/null
@@ -1,9 +0,0 @@
-# RUN: yaml-bench -canonical %s 2>&1 | FileCheck %s
-#
-# We don't currently look at the content of literal tags.
-# XFAIL: *
-
-- !<!> foo
-- !<$:?> bar
-
-# CHECK: error
diff --git a/test/YAMLParser/spec-08-04.test b/test/YAMLParser/spec-08-04.test
new file mode 100644
index 0000000000000..5b502ae3a17f5
--- /dev/null
+++ b/test/YAMLParser/spec-08-04.test
@@ -0,0 +1,7 @@
+# RUN: not yaml-bench -canonical %s 2>&1 | FileCheck %s
+#
+# We don't currently look at the content of literal tags.
+# CHECK: error: Unknown tag handle
+
+- !<!> foo
+- !<$:?> bar
diff --git a/test/YAMLParser/spec-08-05.data b/test/YAMLParser/spec-08-05.test
index 0613446c8974f..0613446c8974f 100644
--- a/test/YAMLParser/spec-08-05.data
+++ b/test/YAMLParser/spec-08-05.test
diff --git a/test/YAMLParser/spec-08-06.data b/test/YAMLParser/spec-08-06.test
index 9844f53a4ef38..b457d59b569e8 100644
--- a/test/YAMLParser/spec-08-06.data
+++ b/test/YAMLParser/spec-08-06.test
@@ -1,7 +1,7 @@
-# RUN: yaml-bench -canonical %s 2>&1 | FileCheck %s
+# RUN: not yaml-bench -canonical %s 2>&1 | FileCheck %s
 #
 # We don't currently validate tags.
-# XFAIL: *
+# CHECK: error: Unknown tag handle
 
 %TAG !o! tag:ben-kiki.org,2000:
 ---
@@ -9,4 +9,3 @@
 - !o! bar
 - !h!type baz
 
-# CHECK: error
diff --git a/test/YAMLParser/spec-08-07.data b/test/YAMLParser/spec-08-07.test
index fc3f2df7f0583..fc3f2df7f0583 100644
--- a/test/YAMLParser/spec-08-07.data
+++ b/test/YAMLParser/spec-08-07.test
diff --git a/test/YAMLParser/spec-08-08.data b/test/YAMLParser/spec-08-08.test
index 460029f6ace09..460029f6ace09 100644
--- a/test/YAMLParser/spec-08-08.data
+++ b/test/YAMLParser/spec-08-08.test
diff --git a/test/YAMLParser/spec-08-09.data b/test/YAMLParser/spec-08-09.test
index 1c8258594310e..1c8258594310e 100644
--- a/test/YAMLParser/spec-08-09.data
+++ b/test/YAMLParser/spec-08-09.test
diff --git a/test/YAMLParser/spec-08-10.data b/test/YAMLParser/spec-08-10.test
index 74054eb08832c..74054eb08832c 100644
--- a/test/YAMLParser/spec-08-10.data
+++ b/test/YAMLParser/spec-08-10.test
diff --git a/test/YAMLParser/spec-08-11.data b/test/YAMLParser/spec-08-11.test
index 8a75783a70954..8a75783a70954 100644
--- a/test/YAMLParser/spec-08-11.data
+++ b/test/YAMLParser/spec-08-11.test
diff --git a/test/YAMLParser/spec-08-12.data b/test/YAMLParser/spec-08-12.test
index 69e78b42d2763..69e78b42d2763 100644
--- a/test/YAMLParser/spec-08-12.data
+++ b/test/YAMLParser/spec-08-12.test
diff --git a/test/YAMLParser/spec-08-13.data b/test/YAMLParser/spec-08-13.test
index 931d56a0cfe7e..931d56a0cfe7e 100644
--- a/test/YAMLParser/spec-08-13.data
+++ b/test/YAMLParser/spec-08-13.test
diff --git a/test/YAMLParser/spec-08-14.data b/test/YAMLParser/spec-08-14.test
index 61c448351ae5f..61c448351ae5f 100644
--- a/test/YAMLParser/spec-08-14.data
+++ b/test/YAMLParser/spec-08-14.test
diff --git a/test/YAMLParser/spec-08-15.data b/test/YAMLParser/spec-08-15.test
index f21e84a431419..f21e84a431419 100644
--- a/test/YAMLParser/spec-08-15.data
+++ b/test/YAMLParser/spec-08-15.test
diff --git a/test/YAMLParser/spec-09-01.data b/test/YAMLParser/spec-09-01.test
index 8999b49616264..8999b49616264 100644
--- a/test/YAMLParser/spec-09-01.data
+++ b/test/YAMLParser/spec-09-01.test
diff --git a/test/YAMLParser/spec-09-02.data b/test/YAMLParser/spec-09-02.data
deleted file mode 100644
index 9d8a58ca33ae2..0000000000000
--- a/test/YAMLParser/spec-09-02.data
+++ /dev/null
@@ -1,14 +0,0 @@
-# RUN: yaml-bench -canonical %s 2>&1 | FileCheck %s
-#
-# Indent trimming is not yet implemented.
-# XFAIL: *
-
- "as space
- trimmed
-
- specific
-
- escaped	\
- none"
-
-# CHECK: !!str "as space trimmed\nspecific\nescaped\tnone"
diff --git a/test/YAMLParser/spec-09-02.test b/test/YAMLParser/spec-09-02.test
new file mode 100644
index 0000000000000..3f8e49a8bd310
--- /dev/null
+++ b/test/YAMLParser/spec-09-02.test
@@ -0,0 +1,14 @@
+# RUN: yaml-bench -canonical %s 2>&1 | FileCheck %s
+
+ "as space
+ trimmed
+
+ specific
+
+ escaped	\
+ none"
+
+# FIXME: The string below should actually be
+#   "as space trimmed\nspecific\nescaped\tnone", but the parser currently has
+#   a bug when parsing multiline quoted strings.
+# CHECK: !!str "as space\n trimmed\n specific\n escaped\t none"
diff --git a/test/YAMLParser/spec-09-03.data b/test/YAMLParser/spec-09-03.test
index 3fb0d8b184abb..3fb0d8b184abb 100644
--- a/test/YAMLParser/spec-09-03.data
+++ b/test/YAMLParser/spec-09-03.test
diff --git a/test/YAMLParser/spec-09-04.data b/test/YAMLParser/spec-09-04.test
index 4178ec6befbd5..4178ec6befbd5 100644
--- a/test/YAMLParser/spec-09-04.data
+++ b/test/YAMLParser/spec-09-04.test
diff --git a/test/YAMLParser/spec-09-05.data b/test/YAMLParser/spec-09-05.test
index e482d5366235b..e482d5366235b 100644
--- a/test/YAMLParser/spec-09-05.data
+++ b/test/YAMLParser/spec-09-05.test
diff --git a/test/YAMLParser/spec-09-06.data b/test/YAMLParser/spec-09-06.test
index edc0cbba9004c..edc0cbba9004c 100644
--- a/test/YAMLParser/spec-09-06.data
+++ b/test/YAMLParser/spec-09-06.test
diff --git a/test/YAMLParser/spec-09-07.data b/test/YAMLParser/spec-09-07.test
index 3c010ca5b93bd..3c010ca5b93bd 100644
--- a/test/YAMLParser/spec-09-07.data
+++ b/test/YAMLParser/spec-09-07.test
diff --git a/test/YAMLParser/spec-09-08.data b/test/YAMLParser/spec-09-08.test
index d114e58fcac15..d114e58fcac15 100644
--- a/test/YAMLParser/spec-09-08.data
+++ b/test/YAMLParser/spec-09-08.test
diff --git a/test/YAMLParser/spec-09-09.data b/test/YAMLParser/spec-09-09.test
index 2fec1b536ef13..2fec1b536ef13 100644
--- a/test/YAMLParser/spec-09-09.data
+++ b/test/YAMLParser/spec-09-09.test
diff --git a/test/YAMLParser/spec-09-10.data b/test/YAMLParser/spec-09-10.test
index faabfb06b5ec2..faabfb06b5ec2 100644
--- a/test/YAMLParser/spec-09-10.data
+++ b/test/YAMLParser/spec-09-10.test
diff --git a/test/YAMLParser/spec-09-11.data b/test/YAMLParser/spec-09-11.test
index 3f487ad6b0439..3f487ad6b0439 100644
--- a/test/YAMLParser/spec-09-11.data
+++ b/test/YAMLParser/spec-09-11.test
diff --git a/test/YAMLParser/spec-09-12.data b/test/YAMLParser/spec-09-12.test
index d992c589cd695..d992c589cd695 100644
--- a/test/YAMLParser/spec-09-12.data
+++ b/test/YAMLParser/spec-09-12.test
diff --git a/test/YAMLParser/spec-09-13.data b/test/YAMLParser/spec-09-13.test
index d48f2d2c47ee3..d48f2d2c47ee3 100644
--- a/test/YAMLParser/spec-09-13.data
+++ b/test/YAMLParser/spec-09-13.test
diff --git a/test/YAMLParser/spec-09-14.data b/test/YAMLParser/spec-09-14.data
deleted file mode 100644
index a83fcd45e2c01..0000000000000
--- a/test/YAMLParser/spec-09-14.data
+++ /dev/null
@@ -1,21 +0,0 @@
-# RUN: yaml-bench -canonical %s 2>&1 | FileCheck %s
-#
-# Not quite sure why this doesn't fail.
-# XFAIL: *
-
----
---- ||| : foo
-... >>>: bar
----
-[
----
-,
-... ,
-{
---- :
-... # Nested
-}
-]
-...
-
-# CHECK: error
diff --git a/test/YAMLParser/spec-09-14.test b/test/YAMLParser/spec-09-14.test
new file mode 100644
index 0000000000000..5f028f920fcdb
--- /dev/null
+++ b/test/YAMLParser/spec-09-14.test
@@ -0,0 +1,18 @@
+# RUN: not yaml-bench -canonical %s 2>&1 | FileCheck %s
+#
+# CHECK: error: Expected a line break after block scalar header
+
+---
+--- ||| : foo
+... >>>: bar
+---
+[
+---
+,
+... ,
+{
+--- :
+... # Nested
+}
+]
+...
diff --git a/test/YAMLParser/spec-09-15.data b/test/YAMLParser/spec-09-15.test
index 4111d1ba2cb12..4111d1ba2cb12 100644
--- a/test/YAMLParser/spec-09-15.data
+++ b/test/YAMLParser/spec-09-15.test
diff --git a/test/YAMLParser/spec-09-16.data b/test/YAMLParser/spec-09-16.test
index e595f47bece9d..e595f47bece9d 100644
--- a/test/YAMLParser/spec-09-16.data
+++ b/test/YAMLParser/spec-09-16.test
diff --git a/test/YAMLParser/spec-09-17.data b/test/YAMLParser/spec-09-17.test
index 1bacf4d68b1f7..1bacf4d68b1f7 100644
--- a/test/YAMLParser/spec-09-17.data
+++ b/test/YAMLParser/spec-09-17.test
diff --git a/test/YAMLParser/spec-09-18.data b/test/YAMLParser/spec-09-18.data
deleted file mode 100644
index ac623f9973f7e..0000000000000
--- a/test/YAMLParser/spec-09-18.data
+++ /dev/null
@@ -1,11 +0,0 @@
-# RUN: yaml-bench -canonical %s
-
-- | # Just the style
- literal
-- >1 # Indentation indicator
-  folded
-- |+ # Chomping indicator
- keep
-
-- >-1 # Both indicators
-  strip
diff --git a/test/YAMLParser/spec-09-18.test b/test/YAMLParser/spec-09-18.test
new file mode 100644
index 0000000000000..cb05bb3774c55
--- /dev/null
+++ b/test/YAMLParser/spec-09-18.test
@@ -0,0 +1,15 @@
+# RUN: yaml-bench -canonical %s | FileCheck %s
+# CHECK: !!str "literal\n"
+# CHECK: !!str " folded\n"
+# CHECK: !!str "keep\n\n"
+# CHECK: !!str " strip"
+
+- | # Just the style
+ literal
+- >1 # Indentation indicator
+  folded
+- |+ # Chomping indicator
+ keep
+
+- >-1 # Both indicators
+  strip
diff --git a/test/YAMLParser/spec-09-19.data b/test/YAMLParser/spec-09-19.data
deleted file mode 100644
index 52aa157137b29..0000000000000
--- a/test/YAMLParser/spec-09-19.data
+++ /dev/null
@@ -1,6 +0,0 @@
-# RUN: yaml-bench -canonical %s
-
-- |
- literal
-- >
- folded
diff --git a/test/YAMLParser/spec-09-19.test b/test/YAMLParser/spec-09-19.test
new file mode 100644
index 0000000000000..f385717b03596
--- /dev/null
+++ b/test/YAMLParser/spec-09-19.test
@@ -0,0 +1,8 @@
+# RUN: yaml-bench -canonical %s | FileCheck %s
+# CHECK: !!str "literal\n"
+# CHECK: !!str "folded\n"
+
+- |
+ literal
+- >
+ folded
diff --git a/test/YAMLParser/spec-09-20.data b/test/YAMLParser/spec-09-20.data
deleted file mode 100644
index 86fc7ab9a2edd..0000000000000
--- a/test/YAMLParser/spec-09-20.data
+++ /dev/null
@@ -1,13 +0,0 @@
-# RUN: yaml-bench -canonical %s
-
-- |
- detected
-- >
- 
-  
-  # detected
-- |1
-  explicit
-- >
- 	
- detected
diff --git a/test/YAMLParser/spec-09-20.test b/test/YAMLParser/spec-09-20.test
new file mode 100644
index 0000000000000..47c255b85739d
--- /dev/null
+++ b/test/YAMLParser/spec-09-20.test
@@ -0,0 +1,17 @@
+# RUN: yaml-bench -canonical %s | FileCheck %s
+# CHECK: !!str "detected\n"
+# CHECK: !!str "\n\n# detected\n"
+# CHECK: !!str " explicit\n"
+# CHECK: !!str "\t\ndetected\n"
+
+- |
+ detected
+- >
+ 
+  
+  # detected
+- |1
+  explicit
+- >
+ 	
+ detected
diff --git a/test/YAMLParser/spec-09-21.data b/test/YAMLParser/spec-09-21.data
deleted file mode 100644
index 6eb7917a97e36..0000000000000
--- a/test/YAMLParser/spec-09-21.data
+++ /dev/null
@@ -1,12 +0,0 @@
-# RUN: yaml-bench -canonical %s 2>&1 | FileCheck %s
-
-- |
-
- text
-- >
-  text
- text
-- |1
- text
-
-# CHECK: error
diff --git a/test/YAMLParser/spec-09-21.test b/test/YAMLParser/spec-09-21.test
new file mode 100644
index 0000000000000..661f986917aff
--- /dev/null
+++ b/test/YAMLParser/spec-09-21.test
@@ -0,0 +1,12 @@
+# RUN: not yaml-bench -canonical %s 2>&1 | FileCheck %s
+
+- |
+
+ text
+- >
+  text
+ text
+- |1
+ text
+
+# CHECK: 8:2: error: A text line is less indented than the block scalar
diff --git a/test/YAMLParser/spec-09-22.data b/test/YAMLParser/spec-09-22.data
deleted file mode 100644
index b95faa50b5d03..0000000000000
--- a/test/YAMLParser/spec-09-22.data
+++ /dev/null
@@ -1,6 +0,0 @@
-# RUN: yaml-bench -canonical %s
-
-strip: |-
-  text
clip: |
-  text…keep: |+
-  text

diff --git a/test/YAMLParser/spec-09-22.test b/test/YAMLParser/spec-09-22.test
new file mode 100644
index 0000000000000..726358dd5ba85
--- /dev/null
+++ b/test/YAMLParser/spec-09-22.test
@@ -0,0 +1,12 @@
+# RUN: yaml-bench -canonical %s | FileCheck %s
+# CHECK: !!str "text"
+# CHECK: !!str "text\n"
+# CHECK: !!str "text\n\n"
+
+strip: |-
+  text
+clip: |
+  text
+keep: |+
+  text
+
diff --git a/test/YAMLParser/spec-09-23.data b/test/YAMLParser/spec-09-23.test
index 94f839818b6ce..94f839818b6ce 100644
--- a/test/YAMLParser/spec-09-23.data
+++ b/test/YAMLParser/spec-09-23.test
diff --git a/test/YAMLParser/spec-09-24.data b/test/YAMLParser/spec-09-24.data
deleted file mode 100644
index f08eae6a80ea6..0000000000000
--- a/test/YAMLParser/spec-09-24.data
+++ /dev/null
@@ -1,8 +0,0 @@
-# RUN: yaml-bench -canonical %s
-
-strip: >-
-
-clip: >
-
-keep: |+
-
diff --git a/test/YAMLParser/spec-09-24.test b/test/YAMLParser/spec-09-24.test
new file mode 100644
index 0000000000000..9cf514138550d
--- /dev/null
+++ b/test/YAMLParser/spec-09-24.test
@@ -0,0 +1,13 @@
+# RUN: yaml-bench -canonical %s | FileCheck %s
+# CHECK: ? !!str "strip"
+# CHECK: : !!str ""
+# CHECK: ? !!str "clip"
+# CHECK: : !!str ""
+# CHECK: ? !!str "keep"
+# CHECK: : !!str "\n"
+
+strip: >-
+
+clip: >
+
+keep: |+
diff --git a/test/YAMLParser/spec-09-25.data b/test/YAMLParser/spec-09-25.data
deleted file mode 100644
index b15edb523d2f1..0000000000000
--- a/test/YAMLParser/spec-09-25.data
+++ /dev/null
@@ -1,5 +0,0 @@
-# RUN: yaml-bench -canonical %s
-
-| # Simple block scalar
- literal
- 	text
diff --git a/test/YAMLParser/spec-09-25.test b/test/YAMLParser/spec-09-25.test
new file mode 100644
index 0000000000000..697b47e9ac7c5
--- /dev/null
+++ b/test/YAMLParser/spec-09-25.test
@@ -0,0 +1,6 @@
+# RUN: yaml-bench -canonical %s | FileCheck %s
+# CHECK: !!str "literal\n\ttext\n"
+
+| # Simple block scalar
+ literal
+ 	text
diff --git a/test/YAMLParser/spec-09-26.data b/test/YAMLParser/spec-09-26.data
deleted file mode 100644
index 286740ed39cc7..0000000000000
--- a/test/YAMLParser/spec-09-26.data
+++ /dev/null
@@ -1,10 +0,0 @@
-# RUN: yaml-bench -canonical %s
-
-|
- 
-  
-  literal
- 
-  text
-
- # Comment
diff --git a/test/YAMLParser/spec-09-26.test b/test/YAMLParser/spec-09-26.test
new file mode 100644
index 0000000000000..c8f31aea2b3e2
--- /dev/null
+++ b/test/YAMLParser/spec-09-26.test
@@ -0,0 +1,11 @@
+# RUN: yaml-bench -canonical %s | FileCheck %s
+# CHECK: !!str "\n\nliteral\n\ntext\n"
+
+|
+ 
+  
+  literal
+ 
+  text
+
+ # Comment
diff --git a/test/YAMLParser/spec-09-27.data b/test/YAMLParser/spec-09-27.data
deleted file mode 100644
index 286740ed39cc7..0000000000000
--- a/test/YAMLParser/spec-09-27.data
+++ /dev/null
@@ -1,10 +0,0 @@
-# RUN: yaml-bench -canonical %s
-
-|
- 
-  
-  literal
- 
-  text
-
- # Comment
diff --git a/test/YAMLParser/spec-09-28.data b/test/YAMLParser/spec-09-28.data
deleted file mode 100644
index 286740ed39cc7..0000000000000
--- a/test/YAMLParser/spec-09-28.data
+++ /dev/null
@@ -1,10 +0,0 @@
-# RUN: yaml-bench -canonical %s
-
-|
- 
-  
-  literal
- 
-  text
-
- # Comment
diff --git a/test/YAMLParser/spec-09-29.data b/test/YAMLParser/spec-09-29.test
index e8906ff64a154..e8906ff64a154 100644
--- a/test/YAMLParser/spec-09-29.data
+++ b/test/YAMLParser/spec-09-29.test
diff --git a/test/YAMLParser/spec-09-30.data b/test/YAMLParser/spec-09-30.test
index a2d8bf495043b..a2d8bf495043b 100644
--- a/test/YAMLParser/spec-09-30.data
+++ b/test/YAMLParser/spec-09-30.test
diff --git a/test/YAMLParser/spec-09-31.data b/test/YAMLParser/spec-09-31.test
index a2d8bf495043b..a2d8bf495043b 100644
--- a/test/YAMLParser/spec-09-31.data
+++ b/test/YAMLParser/spec-09-31.test
diff --git a/test/YAMLParser/spec-09-32.data b/test/YAMLParser/spec-09-32.test
index a2d8bf495043b..a2d8bf495043b 100644
--- a/test/YAMLParser/spec-09-32.data
+++ b/test/YAMLParser/spec-09-32.test
diff --git a/test/YAMLParser/spec-09-33.data b/test/YAMLParser/spec-09-33.test
index a2d8bf495043b..a2d8bf495043b 100644
--- a/test/YAMLParser/spec-09-33.data
+++ b/test/YAMLParser/spec-09-33.test
diff --git a/test/YAMLParser/spec-10-01.data b/test/YAMLParser/spec-10-01.test
index 549a54db42fd5..549a54db42fd5 100644
--- a/test/YAMLParser/spec-10-01.data
+++ b/test/YAMLParser/spec-10-01.test
diff --git a/test/YAMLParser/spec-10-02.data b/test/YAMLParser/spec-10-02.test
index 662427a0c066c..662427a0c066c 100644
--- a/test/YAMLParser/spec-10-02.data
+++ b/test/YAMLParser/spec-10-02.test
diff --git a/test/YAMLParser/spec-10-03.data b/test/YAMLParser/spec-10-03.test
index 43f300e40c350..43f300e40c350 100644
--- a/test/YAMLParser/spec-10-03.data
+++ b/test/YAMLParser/spec-10-03.test
diff --git a/test/YAMLParser/spec-10-04.data b/test/YAMLParser/spec-10-04.test
index 733a570efe8a2..733a570efe8a2 100644
--- a/test/YAMLParser/spec-10-04.data
+++ b/test/YAMLParser/spec-10-04.test
diff --git a/test/YAMLParser/spec-10-05.data b/test/YAMLParser/spec-10-05.test
index 3848b2a20060d..3848b2a20060d 100644
--- a/test/YAMLParser/spec-10-05.data
+++ b/test/YAMLParser/spec-10-05.test
diff --git a/test/YAMLParser/spec-10-06.data b/test/YAMLParser/spec-10-06.test
index 40efb2b916caf..40efb2b916caf 100644
--- a/test/YAMLParser/spec-10-06.data
+++ b/test/YAMLParser/spec-10-06.test
diff --git a/test/YAMLParser/spec-10-07.data b/test/YAMLParser/spec-10-07.test
index 7aa350e40bb52..7aa350e40bb52 100644
--- a/test/YAMLParser/spec-10-07.data
+++ b/test/YAMLParser/spec-10-07.test
diff --git a/test/YAMLParser/spec-10-08.data b/test/YAMLParser/spec-10-08.test
index 53faeb9e001b2..c4cb8e65ef293 100644
--- a/test/YAMLParser/spec-10-08.data
+++ b/test/YAMLParser/spec-10-08.test
@@ -1,8 +1,8 @@
 # RUN: yaml-bench -canonical %s 2>&1 | FileCheck %s
 #
-# This fails because even without a key token, some contexts (in this case flow
-# maps) allow implicit null keys, which mix with this in weird ways.
-# XFAIL: *
+# FIXME: This test should fail. Yaml bench should report an error that a simple
+# key spans across multiple lines and that another simple key is longer than
+# 1024 characters.
 
 {
 multi-line
@@ -10,4 +10,4 @@ multi-line
 very long ...................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................(>1KB)................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................... key: value
 }
 
-# CHECK: error
+# CHECK: ? !!str "very long
diff --git a/test/YAMLParser/spec-10-09.data b/test/YAMLParser/spec-10-09.test
index a6b1fd00dde34..a6b1fd00dde34 100644
--- a/test/YAMLParser/spec-10-09.data
+++ b/test/YAMLParser/spec-10-09.test
diff --git a/test/YAMLParser/spec-10-10.data b/test/YAMLParser/spec-10-10.test
index c97901ddfbe0d..c97901ddfbe0d 100644
--- a/test/YAMLParser/spec-10-10.data
+++ b/test/YAMLParser/spec-10-10.test
diff --git a/test/YAMLParser/spec-10-11.data b/test/YAMLParser/spec-10-11.test
index 51bd06f020257..51bd06f020257 100644
--- a/test/YAMLParser/spec-10-11.data
+++ b/test/YAMLParser/spec-10-11.test
diff --git a/test/YAMLParser/spec-10-12.data b/test/YAMLParser/spec-10-12.test
index 65a90b3f2c5ad..65a90b3f2c5ad 100644
--- a/test/YAMLParser/spec-10-12.data
+++ b/test/YAMLParser/spec-10-12.test
diff --git a/test/YAMLParser/spec-10-13.data b/test/YAMLParser/spec-10-13.test
index ccadeb1e7d5f9..ccadeb1e7d5f9 100644
--- a/test/YAMLParser/spec-10-13.data
+++ b/test/YAMLParser/spec-10-13.test
diff --git a/test/YAMLParser/spec-10-14.data b/test/YAMLParser/spec-10-14.test
index 866ec1f7b2c39..866ec1f7b2c39 100644
--- a/test/YAMLParser/spec-10-14.data
+++ b/test/YAMLParser/spec-10-14.test
diff --git a/test/YAMLParser/spec-10-15.data b/test/YAMLParser/spec-10-15.test
index 7d061bddd1933..7d061bddd1933 100644
--- a/test/YAMLParser/spec-10-15.data
+++ b/test/YAMLParser/spec-10-15.test
diff --git a/test/YAMLParser/str.data b/test/YAMLParser/str.test
index bf013b6f52c5e..bf013b6f52c5e 100644
--- a/test/YAMLParser/str.data
+++ b/test/YAMLParser/str.test
diff --git a/test/YAMLParser/timestamp-bugs.data b/test/YAMLParser/timestamp-bugs.test
index bf41a21b22d98..bf41a21b22d98 100644
--- a/test/YAMLParser/timestamp-bugs.data
+++ b/test/YAMLParser/timestamp-bugs.test
diff --git a/test/YAMLParser/timestamp.data b/test/YAMLParser/timestamp.test
index 79945451b54e9..79945451b54e9 100644
--- a/test/YAMLParser/timestamp.data
+++ b/test/YAMLParser/timestamp.test
diff --git a/test/YAMLParser/utf8-implicit.data b/test/YAMLParser/utf8-implicit.test
index ee2791fb062ee..ee2791fb062ee 100644
--- a/test/YAMLParser/utf8-implicit.data
+++ b/test/YAMLParser/utf8-implicit.test
diff --git a/test/YAMLParser/utf8.data b/test/YAMLParser/utf8.test
index 3935e9d121796..3935e9d121796 100644
--- a/test/YAMLParser/utf8.data
+++ b/test/YAMLParser/utf8.test
diff --git a/test/YAMLParser/value.data b/test/YAMLParser/value.test
index 311ccd4f22e9a..311ccd4f22e9a 100644
--- a/test/YAMLParser/value.data
+++ b/test/YAMLParser/value.test
diff --git a/test/YAMLParser/yaml.data b/test/YAMLParser/yaml.test
index 4f9b294f456b2..4f9b294f456b2 100644
--- a/test/YAMLParser/yaml.data
+++ b/test/YAMLParser/yaml.test