about summary refs log tree commit diff
diff options
context:
space:
mode:
authorBart Schaefer <schaefer@zsh.org>2022-05-02 20:31:47 -0700
committerBart Schaefer <schaefer@zsh.org>2022-05-02 20:31:47 -0700
commit23dab58b8e075db898376d2365e0481f99ab612e (patch)
treea17232e7a65ff17d985cc0402b10f478144f5307
parent1fd328e84cead75dac5fac05b303c6186937395e (diff)
downloadzsh-23dab58b8e075db898376d2365e0481f99ab612e.tar.gz
zsh-23dab58b8e075db898376d2365e0481f99ab612e.tar.xz
zsh-23dab58b8e075db898376d2365e0481f99ab612e.zip
Fix problems with tests for 50126 and 50150.
-rw-r--r--ChangeLog9
-rw-r--r--Test/D07multibyte.ztst5
-rw-r--r--Test/E01options.ztst1
3 files changed, 14 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 5648c3cd9..3d251d71e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2022-05-02  Bart Schaefer  <schaefer@zsh.org>
+
+	* unposted (cf. Jun-ichi 50164): Test/E01options.ztst: add sleep
+	after nullexec test to allow background process to flush writes
+	(observed only on MacOS Monterey 12).
+
+	* 50162: Test/D07multibyte.ztst: Tweak 50150 test to check proper
+	metafication of array elements and to ignore collation variances
+
 2022-05-01  Bart Schaefer  <schaefer@zsh.org>
 
 	* 50160: Test/D03procsubst.ztst, Test/E01options.ztst: Regression
diff --git a/Test/D07multibyte.ztst b/Test/D07multibyte.ztst
index 25634e502..e2e9a25ef 100644
--- a/Test/D07multibyte.ztst
+++ b/Test/D07multibyte.ztst
@@ -631,9 +631,12 @@ F:support character sets outside the portable 7-bit range.
   # Subshell for zmodload isolation
   (
     zmodload zsh/stat
+    typeset -A sizes
     touch 50150-é 50150-Ą
     # Using +size solely in order to make it easier to write the expectations
-    zstat +size -nor -- 50150-*
+    zstat +size -A sizes -nor -- 50150-*
+    print -r -- 50150-Ą $sizes[50150-Ą]
+    print -r -- 50150-é $sizes[50150-é]
   )
 0:(workers/50150) zsh/stat with Unicode and metafication
 >50150-Ą 0
diff --git a/Test/E01options.ztst b/Test/E01options.ztst
index b57b23557..2acbfd357 100644
--- a/Test/E01options.ztst
+++ b/Test/E01options.ztst
@@ -754,6 +754,7 @@
 
 # Subshell to shield nullexec redirections
   ( exec 3>&1 3>&2; print -u 3 some words )
+  sleep 1	# let background multi thread catch up
 0:regression test: multios with nullexec
 >some words
 ?some words