From 580ccaebb8607793af1db6d42ee9078d8e599825 Mon Sep 17 00:00:00 2001
From: Daniel Shahaf <danielsh@apache.org>
Date: Sat, 29 Dec 2018 11:57:15 +0000
Subject: [PATCH] tests: (try to) Fix test failure under zsh<5.3, where
 'typeset -p arrayvar''s is two lines long.

---
 tests/test-highlighting.zsh | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/tests/test-highlighting.zsh b/tests/test-highlighting.zsh
index c4a80ab..6040019 100755
--- a/tests/test-highlighting.zsh
+++ b/tests/test-highlighting.zsh
@@ -86,6 +86,13 @@ _zsh_highlight_add_highlight()
 # Activate the highlighter.
 ZSH_HIGHLIGHT_HIGHLIGHTERS=($1)
 
+# In zsh<5.3, 'typeset -p arrayvar' emits two lines, so we use this wrapper instead.
+typeset_p() {
+	for 1 ; do
+		print -r -- "$1=( ${(@q-P)1} )"
+	done
+}
+
 # Runs a highlighting test
 # $1: data file
 run_test_internal() {
@@ -155,7 +162,7 @@ run_test_internal() {
   if (( $#expected_region_highlight == $#region_highlight )); then
     print -r -- "ok $i - cardinality check" "${expected_mismatch:+"# TODO ${(qqq)expected_mismatch}"}"
   else
-    print -r -- "not ok $i - have $#expected_region_highlight expectations and $#region_highlight region_highlight entries: «$(typeset -p expected_region_highlight)» «$(typeset -p region_highlight)»" "${expected_mismatch:+"# TODO ${(qqq)expected_mismatch}"}"
+    print -r -- "not ok $i - have $#expected_region_highlight expectations and $#region_highlight region_highlight entries: «$(typeset_p expected_region_highlight)» «$(typeset_p region_highlight)»" "${expected_mismatch:+"# TODO ${(qqq)expected_mismatch}"}"
   fi
 }