help_print_desc: Simplify implementation.

[dxcommon.git] / tests / functions.at

diff --git a/tests/functions.at b/tests/functions.at
index fd1e10f5588460f36882c766285a5b56759011fa..71a282d7d4c67c0c9a62cd2662fb3d7a5841ef5c 100644 (file)
--- a/tests/functions.at
+++ b/tests/functions.at
@@ -33,6 +33,11 @@ sed -e '5,$s/^/     /' -e '6,$s/^/     /' \
 AT_CHECK(["$builddir/t/helpdesc" 0 0 10 5 30 20 40 40 <test.txt],
   [0], [expout])
 
+AT_CHECK([AS_ECHO_N(["no trailing newline"]) |
+  "$builddir/t/helpdesc" 0 0], [0],
+[no trailing newline
+])
+
 AT_CLEANUP
 
 AT_SETUP([help_print_desc (empty description)])
@@ -40,7 +45,9 @@ AT_KEYWORDS([help])
 
 AT_SKIP_IF([test ! -x "$builddir/t/helpdesc"])
 
-AT_CHECK(["$builddir/t/helpdesc" 0 0 0 20 </dev/null])
+AT_CHECK(["$builddir/t/helpdesc" 0 0 0 20 </dev/null], [0], [
+
+])
 AT_CHECK(["$builddir/t/helpdesc" 1 20 </dev/null], [0], [
 ])
 
@@ -116,14 +123,22 @@ AT_KEYWORDS([help nls])
 AT_SKIP_IF([test ! -x "$builddir/t/helpopt3"])
 TEST_UTF8_LOCALE([locale_utf8])
 
-AT_CHECK([m4_join([ ],
-  [LC_ALL=$locale_utf8 "$builddir/t/helpopt3"],
-  [--全角],
-  [--ﾊﾝｶｸ],
-  )], [0],
-[[  --全角   8
-  --ﾊﾝｶｸ       8
-]])
+# Avoid some deficient shell parsers barfing on UTF-8 sequences by
+# generating them this way using octal escapes.
+$AWK -f - >expout <<'EOF'
+BEGIN {
+  zenkaku = "--\345\205\250\350\247\222";
+  hankaku = "--\357\276\212\357\276\235\357\275\266\357\275\270"
+
+  print zenkaku, hankaku >"args"
+
+  print "  " zenkaku "\t" "8"
+  print "  " hankaku "\t" "8"
+}
+EOF
+
+AT_CHECK([LC_ALL=$locale_utf8 xargs "$builddir/t/helpopt3" <args],
+  [0], [expout])
 
 AT_CLEANUP