Make tests work with yaml-test-suite changes

ingydotnet · ingydotnet · commit 629eb6871049 · 2021-11-26T08:03:30.000-08:00
diff --git a/.common.mk b/.common.mk
@@ -1,5 +1,7 @@
 SHELL := bash
 
+.PHONY: test
+
 ifeq ($(ROOT),)
     $(error ROOT not defined)
 endif
@@ -60,7 +62,9 @@ $(SPEC_YAML):
 	make -C $@ src/node_modules
 
 ../test/suite:
-	git clone https://github.com/yaml/yaml-test-suite $@
+	git clone --branch=main https://github.com/yaml/yaml-test-suite $@
+	make -C $@ testml
+	ln -s testml $@/test
 
 $(NODE_MODULES):
 	make -C $(ROOT) $(@:$(ROOT)/%=%)
diff --git a/coffeescript/test/testml-bridge.coffee b/coffeescript/test/testml-bridge.coffee
@@ -25,10 +25,16 @@ class TestMLBridge extends TestML.Bridge
       parser.receiver.output()
 
   unescape: (text)->
-    text.replace(/<SPC>/g, ' ')
-      .replace(/<TAB>/g, "\t")
+    text = text
+      .replace(/␣/g, ' ')
+      .replace(/—*»/g, "\t")
+      .replace(/⇔/g, "\uFEFF")
+      .replace(/↵/g, '')
+      .replace(/∎\n$/, '')
+
+    # text = text.replace(/↓/g, "\r")
+
+    return text
 
   fix_test_output: (text)->
     return text
-      .replace(/^\+MAP\ \{\}/gm, '+MAP')
-      .replace(/^\+SEQ\ \[\]/gm, '+SEQ')
diff --git a/javascript/test/testml-bridge.js b/javascript/test/testml-bridge.js
diff --git a/perl/test/TestMLBridge.pm b/perl/test/TestMLBridge.pm
@@ -1,6 +1,7 @@
 use v5.12;
 package TestMLBridge;
 use base 'TestML::Bridge';
+use utf8;
 
 use lib 'lib';
 
@@ -27,15 +28,20 @@ sub parse {
 
 sub unescape {
   my ($self, $text) = @_;
-  $text =~ s/<SPC>/ /g;
-  $text =~ s/<TAB>/\t/g;
+
+  $text =~ s/␣/ /g;
+  $text =~ s/—*»/\t/g;
+  $text =~ s/⇔/x{FEFF}/g;
+  $text =~ s/↵//g;
+  $text =~ s/∎\n\z//;
+
+  # $text =~ s/↓/\r/g;
+
   return $text;
 }
 
 sub fix_test_output {
   my ($self, $text) = @_;
-  $text =~ s/^\+MAP\ \{\}/+MAP/gm;
-  $text =~ s/^\+SEQ\ \[\]/+SEQ/gm;
   return $text;
 }
 
