Casenorm tests: fix unicode interpretation

Use `printf` to properly interpret unusual symbols. + zlook doesn't exists in ZoL, use `test`. Signed-off-by: George Melikov <mail@gmelikov.ru>
openzfs · Nov 17, 2019 · def95da · def95da
1 parent 64c77c4
commit def95da
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 22 deletions.
diff --git a/tests/test-runner/bin/zts-report.py b/tests/test-runner/bin/zts-report.py
@@ -160,20 +160,6 @@
 # reasons listed above can be used.
 #
 known = {
-    'casenorm/sensitive_none_lookup': ['FAIL', '7633'],
-    'casenorm/sensitive_none_delete': ['FAIL', '7633'],
-    'casenorm/sensitive_formd_lookup': ['FAIL', '7633'],
-    'casenorm/sensitive_formd_delete': ['FAIL', '7633'],
-    'casenorm/insensitive_none_lookup': ['FAIL', '7633'],
-    'casenorm/insensitive_none_delete': ['FAIL', '7633'],
-    'casenorm/insensitive_formd_lookup': ['FAIL', '7633'],
-    'casenorm/insensitive_formd_delete': ['FAIL', '7633'],
-    'casenorm/mixed_none_lookup': ['FAIL', '7633'],
-    'casenorm/mixed_none_lookup_ci': ['FAIL', '7633'],
-    'casenorm/mixed_none_delete': ['FAIL', '7633'],
-    'casenorm/mixed_formd_lookup': ['FAIL', '7633'],
-    'casenorm/mixed_formd_lookup_ci': ['FAIL', '7633'],
-    'casenorm/mixed_formd_delete': ['FAIL', '7633'],
     'cli_root/zfs_receive/zfs_receive_004_neg': ['FAIL', known_reason],
     'cli_root/zfs_unshare/zfs_unshare_002_pos': ['SKIP', na_reason],
     'cli_root/zfs_unshare/zfs_unshare_006_pos': ['SKIP', na_reason],

diff --git a/tests/zfs-tests/include/commands.cfg b/tests/zfs-tests/include/commands.cfg
@@ -13,6 +13,7 @@ export SYSTEM_FILES='arp
     attr
     base64
     basename
+    bash
     bc
     blkid
     blockdev

diff --git a/tests/zfs-tests/tests/functional/casenorm/casenorm.cfg b/tests/zfs-tests/tests/functional/casenorm/casenorm.cfg
@@ -17,12 +17,13 @@
 # Copyright (c) 2016 by Delphix. All rights reserved.
 #
 
-NAME_C_ORIG=$(echo 'F\0303\0257L\0303\0253N\0303\0204m\0303\0253')
-NAME_C_UPPER=$(echo 'F\0303\0217L\0303\0213N\0303\0204M\0303\0213')
-NAME_C_LOWER=$(echo 'f\0303\0257l\0303\0253n\0303\0244m\0303\0253')
-NAME_D_ORIG=$(echo 'Fi\0314\0210Le\0314\0210NA\0314\0210me\0314\0210')
-NAME_D_UPPER=$(echo 'FI\0314\0210LE\0314\0210NA\0314\0210ME\0314\0210')
-NAME_D_LOWER=$(echo 'fi\0314\0210le\0314\0210na\0314\0210me\0314\0210')
+# ksh version on Linux may not work with UTF correctly, so use bash
+NAME_C_ORIG=$(bash -c "printf '\u0046\u00ef\u004c\u00eb\u004e\u00c4\u006d\u00eb'")
+NAME_C_UPPER=$(bash -c "printf '\u0046\u00cf\u004c\u00cb\u004e\u00c4\u004d\u00cb'")
+NAME_C_LOWER=$(bash -c "printf '\u0066\u00ef\u006c\u00eb\u006e\u00e4\u006d\u00eb'")
+NAME_D_ORIG=$(bash -c "printf '\u0046\u0069\u0308\u004c\u0065\u0308\u004e\u0041\u0308\u006d\u0065\u0308'")
+NAME_D_UPPER=$(bash -c "printf '\u0046\u0049\u0308\u004c\u0045\u0308\u004e\u0041\u0308\u004d\u0045\u0308'")
+NAME_D_LOWER=$(bash -c "printf '\u0066\u0069\u0308\u006c\u0065\u0308\u006e\u0061\u0308\u006d\u0065\u0308'")
 NAMES_ORIG="$NAME_C_ORIG $NAME_D_ORIG"
 NAMES_UPPER="$NAME_C_UPPER $NAME_D_UPPER"
 NAMES_LOWER="$NAME_C_LOWER $NAME_D_LOWER"

diff --git a/tests/zfs-tests/tests/functional/casenorm/casenorm.kshlib b/tests/zfs-tests/tests/functional/casenorm/casenorm.kshlib
@@ -65,14 +65,22 @@ function lookup_file
 {
 	typeset name=$1
 
-	zlook -l $TESTDIR $name >/dev/null 2>&1
+	if is_linux; then
+		test -f "${TESTDIR}/${name}" >/dev/null 2>&1
+	else
+		zlook -l $TESTDIR $name >/dev/null 2>&1
+	fi
 }
 
 function lookup_file_ci
 {
 	typeset name=$1
 
-	zlook -il $TESTDIR $name >/dev/null 2>&1
+	if is_linux; then
+		test -f "${TESTDIR}/${name}" >/dev/null 2>&1
+	else
+		zlook -il $TESTDIR $name >/dev/null 2>&1
+	fi
 }
 
 function lookup_any