12 files changed, 1295 insertions, 42 deletions
diff --git a/testsuite/awk.tests b/testsuite/awk.tests
index be25f6696..af9ed5359 100755
--- a/testsuite/awk.tests
+++ b/testsuite/awk.tests
@@ -480,6 +480,20 @@ testing 'awk backslash+newline eaten with no trace' \
        "Hello world\n" \
        '' ''
+optional PLATFORM_MINGW32
+testing 'awk match line ending' \
+        "awk '/world$/'" \
+        "world\n" \
+        "" \
+        "hello\r\nworld\r\n"
+testing 'awk backslash+CRLF eaten with no trace' \
+        "awk -f -" \
+        "Hello world\n" \
+        '' \
+        'BEGIN { printf "Hello\\\r\n world\\n" }\n'
+SKIP=
 # User-supplied bug (SEGV) example, was causing use-after-realloc
 testing 'awk assign while assign' \
        "awk '\$5=\$\$5=\$0'; echo \$?" \
diff --git a/testsuite/busybox.tests b/testsuite/busybox.tests
index beb17440c..2ce09b281 100755
--- a/testsuite/busybox.tests
+++ b/testsuite/busybox.tests
@@ -7,11 +7,22 @@
 . ./testing.sh
 test -f "$bindir/.config" && . "$bindir/.config"
-ln -s `which busybox` unknown
+if [ -f "$bindir/busybox.exe" ]; then
+        # Copy rather than link busybox.exe:  we can only make hard
+        # links which can't be deleted because Windows sees the
+        # executable as running.
+        suffix=".exe"
+        lncmd="cp"
+else
+        suffix=""
+        lncmd="ln -s"
+fi
+$lncmd "$(which busybox)" unknown$suffix
 testing "busybox as unknown name" "./unknown 2>&1" \
        "unknown: applet not found\n" "" ""
-rm unknown
+rm unknown$suffix
 # We need busybox --help to be enabled for the rest of tests
 test x"$CONFIG_BUSYBOX" = x"y" \
@@ -23,7 +34,7 @@ optional FEATURE_VERBOSE_USAGE
 testing "busybox --help busybox" "true | busybox --help busybox 2>&1 | cat" "$HELPDUMP\n" "" ""
 SKIP=
-ln -s `which busybox` busybox-suffix
+$lncmd "$(which busybox)" busybox-suffix$suffix
 for i in busybox ./busybox-suffix
 do
        testing "$i" "$i 2>&1 | cat" "$HELPDUMP\n" "" ""
@@ -42,6 +53,6 @@ do
        testing "$i --help unknown" "$i --help unknown 2>&1" \
                "unknown: applet not found\n" "" ""
 done
-rm busybox-suffix
+rm busybox-suffix$suffix
 exit $FAILCOUNT
diff --git a/testsuite/cpio.tests b/testsuite/cpio.tests
index 85e746589..a4462c53e 100755
--- a/testsuite/cpio.tests
+++ b/testsuite/cpio.tests
@@ -154,6 +154,29 @@ testing "cpio -R with extract" \
 " "" ""
 SKIP=
+# Create an archive containing a file with "../dont_write" filename.
+# See that it will not be allowed to unpack.
+# NB: GNU cpio 2.15 DOES NOT do such checks.
+optional FEATURE_PATH_TRAVERSAL_PROTECTION
+rm -rf cpio.testdir
+mkdir -p cpio.testdir/prepare/inner
+echo "file outside of destination was written" > cpio.testdir/prepare/dont_write
+echo "data" > cpio.testdir/prepare/inner/to_extract
+mkdir -p cpio.testdir/extract
+testing "cpio extract file outside of destination" "\
+(cd cpio.testdir/prepare/inner && echo -e '../dont_write\nto_extract' | cpio -o -H newc) | (cd cpio.testdir/extract && cpio -vi 2>&1)
+echo \$?
+ls cpio.testdir/dont_write 2>&1" \
+"\
+cpio: removing leading '../' from member names
+../dont_write
+to_extract
+1 blocks
+0
+ls: cpio.testdir/dont_write: No such file or directory
+" "" ""
+SKIP=
 # Clean up
 rm -rf cpio.testdir cpio.testdir2 2>/dev/null
diff --git a/testsuite/cryptpw.tests b/testsuite/cryptpw.tests
index 0dd91fe15..83bfde521 100755
--- a/testsuite/cryptpw.tests
+++ b/testsuite/cryptpw.tests
@@ -22,21 +22,93 @@ testing "cryptpw des zz" \
 #SKIP=
 optional USE_BB_CRYPT_SHA
-testing "cryptpw sha256" \
+# Note: mkpasswd-5.6.2 won't accept "-m sha256", wants "-m sha256crypt"
-        "cryptpw -m sha256 QWErty '123456789012345678901234567890'" \
+testing 'cryptpw sha256' \
-        '$5$1234567890123456$5DxfOCmU4vRhtzfsbdK.6wSGMwwVbac7ZkWwusb8Si7\n' "" ""
+        'cryptpw -m sha256 QWErty 1234567890123456' \
+        '$5$1234567890123456$5DxfOCmU4vRhtzfsbdK.6wSGMwwVbac7ZkWwusb8Si7\n' \
+        '' ''
+# mkpasswd-5.6.2 does not allow overlong salts, we truncate (at 16 chars for sha256)
+testing 'cryptpw sha256 overlong' \
+        'cryptpw -m sha256 QWErty 123456789012345678901234567890' \
+        '$5$1234567890123456$5DxfOCmU4vRhtzfsbdK.6wSGMwwVbac7ZkWwusb8Si7\n' \
+        '' ''
+testing 'cryptpw sha256 implicit' \
+        'cryptpw QWErty \$5\$1234567890123456' \
+        '$5$1234567890123456$5DxfOCmU4vRhtzfsbdK.6wSGMwwVbac7ZkWwusb8Si7\n' \
+        '' ''
+testing 'cryptpw sha256 rounds=99999' \
+        'cryptpw -m sha256 QWErty rounds=99999\$123456789012345678901234567890' \
+        '$5$rounds=99999$1234567890123456$aYellycJGZM6AKyVzaQsSrDBdTixubtMnM6J.MN0xM8\n' \
+        '' ''
+testing 'cryptpw sha256 rounds=99999 implicit' \
+        'cryptpw QWErty \$5\$rounds=99999\$123456789012345678901234567890' \
+        '$5$rounds=99999$1234567890123456$aYellycJGZM6AKyVzaQsSrDBdTixubtMnM6J.MN0xM8\n' \
+        '' ''
-testing "cryptpw sha256 rounds=99999" \
+testing 'cryptpw sha512' \
-        "cryptpw -m sha256 QWErty 'rounds=99999\$123456789012345678901234567890'" \
+        'cryptpw -m sha512 QWErty 123456789012345678901234567890' \
-        '$5$rounds=99999$1234567890123456$aYellycJGZM6AKyVzaQsSrDBdTixubtMnM6J.MN0xM8\n' "" ""
+        '$6$1234567890123456$KB7QqxFyqmJSWyQYcCuGeFukgz1bPQoipWZf7.9L7z3k8UNTXa6UikbKcUGDc2ANn7DOGmDaroxDgpK16w/RE0\n' \
+        '' ''
-testing "cryptpw sha512" \
+testing 'cryptpw sha512crypt' \
-        "cryptpw -m sha512 QWErty '123456789012345678901234567890'" \
+        'cryptpw -m sha512crypt QWErty 123456789012345678901234567890' \
-        '$6$1234567890123456$KB7QqxFyqmJSWyQYcCuGeFukgz1bPQoipWZf7.9L7z3k8UNTXa6UikbKcUGDc2ANn7DOGmDaroxDgpK16w/RE0\n' "" ""
+        '$6$1234567890123456$KB7QqxFyqmJSWyQYcCuGeFukgz1bPQoipWZf7.9L7z3k8UNTXa6UikbKcUGDc2ANn7DOGmDaroxDgpK16w/RE0\n' \
+        '' ''
+testing 'cryptpw sha512 rounds=99999' \
+        'cryptpw -m sha512 QWErty rounds=99999\$123456789012345678901234567890' \
+        '$6$rounds=99999$1234567890123456$BfF6gD6ZjUmwawH5QaAglYAxtU./yvsz0fcQ464l49aMI2DZW3j5ri28CrxK7riPWNpLuUpfaIdY751SBYKUH.\n' \
+        '' ''
+SKIP=
-testing "cryptpw sha512 rounds=99999" \
+optional USE_BB_CRYPT_YES
-        "cryptpw -m sha512 QWErty 'rounds=99999\$123456789012345678901234567890'" \
+testing 'cryptpw yescrypt' \
-        '$6$rounds=99999$1234567890123456$BfF6gD6ZjUmwawH5QaAglYAxtU./yvsz0fcQ464l49aMI2DZW3j5ri28CrxK7riPWNpLuUpfaIdY751SBYKUH.\n' "" ""
+        'cryptpw -m yescrypt qweRTY123@-+ j9T\$123456789012345678901234' \
+        '$y$j9T$123456789012345678901234$AKxw5OX/T4jD.v./IW.5tE/j7izNjw06fg3OvH1LsN9\n' \
+        '' ''
+testing 'cryptpw yescrypt with non-standard N=2048 instead of 4096 (j8T instead of j9T)' \
+        'cryptpw -m yescrypt qweRTY123@-+ j8T\$123456789012345678901234' \
+        '$y$j8T$123456789012345678901234$JQUUfopCxlfZNE8f.THJwbOkhy.XtB3GIjo9HUVioWB\n' \
+        '' ''
+# mkpasswd-5.6.2 allows short salts for yescrypt
+# ...but there is a catch. Not all of them.
+# The "partial" (not fitting in whole bytes) ascii64-encoded salt
+# is a special case. For example, "$zzz" would not even work in upstream.
+testing 'cryptpw yescrypt with empty salt' \
+        'cryptpw -m yescrypt qweRTY123@-+ j9T\$' \
+        '$y$j9T$$hpeksL94GXNRwnA00L3c8WFy0khFAUbCpBSak.N3Bp.\n' \
+        '' ''
+testing 'cryptpw yescrypt with 3-char salt' \
+        'cryptpw -m yescrypt qweRTY123@-+ j9T\$123' \
+        '$y$j9T$123$A34DMIGUbUIo3bjx66Wtk2IFoREMIw6d49it25KQh2D\n' \
+        '' ''
+# "." is not allowed in mkpasswd-5.6.2
+# ....................................
+# ".." is decoded into one zero byte (not two)
+testing 'cryptpw yescrypt with 2-char salt ".."' \
+        'cryptpw -m yescrypt qweRTY123@-+ j9T\$..' \
+        '$y$j9T$..$yVHeOayxOGg6cHL3.dg10u7T.qSgySfLN3uhSVSLNn/\n' \
+        '' ''
+# "..." is decoded into two zero bytes (not three, not one)
+testing 'cryptpw yescrypt with 3-char salt "..."' \
+        'cryptpw -m yescrypt qweRTY123@-+ j9T\$...' \
+        '$y$j9T$...$xHvJ5USZ7hFyXYbOijtEOMfZRS23cWIxu2eIBXRymA5\n' \
+        '' ''
+# "...." is decoded into three zero bytes (no surprises here)
+testing 'cryptpw yescrypt with 4-char salt "...."' \
+        'cryptpw -m yescrypt qweRTY123@-+ j9T\$....' \
+        '$y$j9T$....$wOnauYL2/NEtr6YQi9pi8AtV7L57sEbVOAnWJIcP9q2\n' \
+        '' ''
+# 84 chars = 21 4-char blocks which decode into 21*3 = 63 bytes.
+# The last byte of the maximum allowed salt size has to come from an incomplete
+# char block. E.g. "z/" encodes byte 0x7f. "z1" is 0xff.
+# Anything larger (e.g. "z2") is an error (it encodes 0x13f).
+testing 'cryptpw yescrypt with 86-char salt (max size)' \
+        'cryptpw -m yescrypt qweRTY123@-+ j9T\$123456789012345678901234567890123456789012345678901234567890123456789012345678901234z/' \
+        '$y$j9T$123456789012345678901234567890123456789012345678901234567890123456789012345678901234z/$Exxe8IoPXiddFsqj7iqCanRf8FyquAoB0/uceLmLjG.\n' \
+        '' ''
+testing 'cryptpw yescrypt implicit' \
+        'cryptpw qweRTY123@-+ \$y\$j9T\$123456789012345678901234' \
+        '$y$j9T$123456789012345678901234$AKxw5OX/T4jD.v./IW.5tE/j7izNjw06fg3OvH1LsN9\n' \
+        '' ''
 SKIP=
 exit $FAILCOUNT
diff --git a/testsuite/diff.tests b/testsuite/diff.tests
index 0ced0f248..ee0567a80 100755
--- a/testsuite/diff.tests
+++ b/testsuite/diff.tests
@@ -123,6 +123,69 @@ testing "diff always takes context from old file" \
        "abc\na  c\ndef\n" \
        "a c\n"
+optional PLATFORM_MINGW32 LONG_OPTS
+testing "diff LF line endings" \
+        'diff -u - input' \
+"\
+--- -
+++ input
+@@ -1,4 +1,4 @@
+ a
+ b
+c
+ d
+-e
+" \
+        "a\nb\nc\nd\n" \
+        "a\nb\nd\ne\n"
+testing "diff --binary LF line endings" \
+        'diff --binary -u - input' \
+"\
+--- -
+++ input
+@@ -1,4 +1,4 @@
+ a
+ b
+c
+ d
+-e
+" \
+        "a\nb\nc\nd\n" \
+        "a\nb\nd\ne\n"
+testing "diff CRLF line endings" \
+        'diff -u - input' \
+"\
+--- -
+++ input
+@@ -1,4 +1,4 @@
+ a
+ b
+c
+ d
+-e
+" \
+        "a\r\nb\r\nc\r\nd\r\n" \
+        "a\r\nb\r\nd\r\ne\r\n"
+testing "diff --binary CRLF line endings" \
+        'diff --binary -u - input' \
+"\
+--- -
+++ input
+@@ -1,4 +1,4 @@
+ a
+ b
+c
+ d
+-e
+" \
+        "a\r\nb\r\nc\r\nd\r\n" \
+        "a\r\nb\r\nd\r\ne\r\n"
+SKIP=
 # testing "test name" "commands" "expected result" "file input" "stdin"
 # clean up
diff --git a/testsuite/env.tests b/testsuite/env.tests
new file mode 100755
index 000000000..8b810e44b
--- /dev/null
+++ b/testsuite/env.tests
@@ -0,0 +1,71 @@
+#!/bin/sh
+# Copyright 2022 by Ron Yorston
+# Licensed under GPLv2, see file LICENSE in this source tree.
+. ./testing.sh
+# testing "test name" "commands" "expected result" "file input" "stdin"
+optional PLATFORM_MINGW32
+# Not so much a test of 'env' as of whether environment variables
+# (or the lack thereof) are correctly passed to child processes.
+testing "environment variables 1a" \
+        "V=set env sh -c 'env | grep ^V='" \
+        "V=set
+" "" ""
+testing "environment variables 1b" \
+        "V= env sh -c 'env | grep ^V='" \
+        "V=
+" "" ""
+testing "environment variables 1c" \
+        "env sh -c 'env | grep ^V='" \
+        "" "" ""
+testing "environment variables 2a" \
+        "V=set sh -c 'env | grep ^V='" \
+        "V=set
+" "" ""
+testing "environment variables 2b" \
+        "V= sh -c 'env | grep ^V='" \
+        "V=
+" "" ""
+testing "environment variables 2c" \
+        "sh -c 'env | grep ^V='" \
+        "" "" ""
+testing "environment variables 3a" \
+        "V=set env sh -c 'echo \${V-unset}'" \
+        "set
+" "" ""
+testing "environment variables 3b" \
+        "V= env sh -c 'echo \${V-unset}'" \
+        "
+" "" ""
+testing "environment variables 3c" \
+        "env sh -c 'echo \${V-unset}'" \
+        "unset
+" "" ""
+testing "environment variables 4a" \
+        "V=set sh -c 'echo \${V-unset}'" \
+        "set
+" "" ""
+testing "environment variables 4b" \
+        "V= sh -c 'echo \${V-unset}'" \
+        "
+" "" ""
+testing "environment variables 4c" \
+        "sh -c 'echo \${V-unset}'" \
+        "unset
+" "" ""
+SKIP=
+exit $FAILCOUNT
diff --git a/testsuite/hexdump.tests b/testsuite/hexdump.tests
index 517ec508b..b2f6a2201 100755
--- a/testsuite/hexdump.tests
+++ b/testsuite/hexdump.tests
@@ -5,6 +5,17 @@
 . ./testing.sh
+input=\
+"\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"\
+"\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f"\
+"\x70\x71\x72\x73\x74\x75\x76\x77\x78\x79\x7a\x7b\x7c\x7d\x7e\x7f"\
+"\x80\x81\x82\x83\x84\x85\x86\x87\x88\x89\x8a\x8b\x8c\x8d\x8e\x8f"\
+"\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff"
+little_endian=false
+{ printf '\0\1' | hexdump -d | grep -q 256; } && little_endian=true
+readonly little_endian
 # testing "description" "command" "result" "infile" "stdin"
 testing 'hexdump -C with four NULs' \
        'hexdump -C' \
@@ -43,12 +54,7 @@ testing "hexdump -e %3_u" \
  80  81  82  83  84  85  86  87  88  89  8a  8b  8c  8d  8e  8f
  f0  f1  f2  f3  f4  f5  f6  f7  f8  f9  fa  fb  fc  fd  fe  ff
 " \
-        "" \
+        "" "$input"
-"\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"\
-"\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f"\
-"\x70\x71\x72\x73\x74\x75\x76\x77\x78\x79\x7a\x7b\x7c\x7d\x7e\x7f"\
-"\x80\x81\x82\x83\x84\x85\x86\x87\x88\x89\x8a\x8b\x8c\x8d\x8e\x8f"\
-"\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff"\
 testing "hexdump -e /1 %d" \
        "hexdump -e '16/1 \" %4d\" \"\n\"'" \
@@ -59,33 +65,74 @@ testing "hexdump -e /1 %d" \
 -128 -127 -126 -125 -124 -123 -122 -121 -120 -119 -118 -117 -116 -115 -114 -113
  -16  -15  -14  -13  -12  -11  -10   -9   -8   -7   -6   -5   -4   -3   -2   -1
 " \
-        "" \
+        "" "$input"
-"\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"\
-"\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f"\
-"\x70\x71\x72\x73\x74\x75\x76\x77\x78\x79\x7a\x7b\x7c\x7d\x7e\x7f"\
-"\x80\x81\x82\x83\x84\x85\x86\x87\x88\x89\x8a\x8b\x8c\x8d\x8e\x8f"\
-"\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff"\
-testing "hexdump -e /2 %d" \
+$little_endian || SKIP=1
-        "hexdump -e '8/2 \" %6d\" \"\n\"'" \
+testing "hexdump -e /2 %d (little endian)" \
-        "\
+        "hexdump -e '8/2 \" %6d\" \"\n\"'" \
+        "\
    256    770   1284   1798   2312   2826   3340   3854
   4368   4882   5396   5910   6424   6938   7452   7966
  29040  29554  30068  30582  31096  31610  32124  32638
 -32384 -31870 -31356 -30842 -30328 -29814 -29300 -28786
  -3600  -3086  -2572  -2058  -1544  -1030   -516     -2
 " \
-        "" \
+        "" "$input"
-"\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"\
+SKIP=
-"\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f"\
-"\x70\x71\x72\x73\x74\x75\x76\x77\x78\x79\x7a\x7b\x7c\x7d\x7e\x7f"\
+$little_endian && SKIP=1
-"\x80\x81\x82\x83\x84\x85\x86\x87\x88\x89\x8a\x8b\x8c\x8d\x8e\x8f"\
+testing "hexdump -e /2 %d (big endian)" \
-"\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff"\
+        "hexdump -e '8/2 \" %6d\" \"\n\"'" \
+        "\
+      1    515   1029   1543   2057   2571   3085   3599
+   4113   4627   5141   5655   6169   6683   7197   7711
+  28785  29299  29813  30327  30841  31355  31869  32383
+ -32639 -32125 -31611 -31097 -30583 -30069 -29555 -29041
+  -3855  -3341  -2827  -2313  -1799  -1285   -771   -257
+" \
+        "" "$input"
+SKIP=
-testing "hexdump -n4 -e '\"%u\"'" \
+$little_endian || SKIP=1
+testing "hexdump -e /2 %x (little endian)" \
+        "hexdump -e '8/2 \" %6x\" \"\n\"'" \
+        "\
+    100    302    504    706    908    b0a    d0c    f0e
+   1110   1312   1514   1716   1918   1b1a   1d1c   1f1e
+   7170   7372   7574   7776   7978   7b7a   7d7c   7f7e
+   8180   8382   8584   8786   8988   8b8a   8d8c   8f8e
+   f1f0   f3f2   f5f4   f7f6   f9f8   fbfa   fdfc   fffe
+" \
+        "" "$input"
+SKIP=
+$little_endian && SKIP=1
+testing "hexdump -e /2 %x (big endian)" \
+        "hexdump -e '8/2 \" %6x\" \"\n\"'" \
+        "\
+      1    203    405    607    809    a0b    c0d    e0f
+   1011   1213   1415   1617   1819   1a1b   1c1d   1e1f
+   7071   7273   7475   7677   7879   7a7b   7c7d   7e7f
+   8081   8283   8485   8687   8889   8a8b   8c8d   8e8f
+   f0f1   f2f3   f4f5   f6f7   f8f9   fafb   fcfd   feff
+" \
+        "" "$input"
+SKIP=
+$little_endian || SKIP=1
+testing "hexdump -n4 -e '\"%u\"' (little endian)" \
        "hexdump -n4 -e '\"%u\"'" \
        "12345678" \
        "" \
        "\x4e\x61\xbc\x00AAAA"
+SKIP=
+$little_endian && SKIP=1
+testing "hexdump -n4 -e '\"%u\"' (big endian)" \
+        "hexdump -n4 -e '\"%u\"'" \
+        "1315027968" \
+        "" \
+        "\x4e\x61\xbc\x00AAAA"
+SKIP=
 exit $FAILCOUNT
diff --git a/testsuite/make.tests b/testsuite/make.tests
new file mode 100755
index 000000000..fabdbe45c
--- /dev/null
+++ b/testsuite/make.tests
@@ -0,0 +1,805 @@
+#!/bin/sh
+. ./testing.sh
+unset MAKEFLAGS
+rm -rf make.tempdir
+# testing "test name" "command" "expected result" "file input" "stdin"
+testing "make basic makefile" \
+        "make -f -" "target\n" "" '
+target:
+        @echo target
+'
+testing "make .DEFAULT rule for prerequisite" \
+        "make -f - 2>/dev/null" "source\n" "" '
+.DEFAULT:
+        @echo $@
+target: source
+'
+mkdir make.tempdir && cd make.tempdir || exit 1
+touch target.xyz
+testing "make empty command overrides inference rule" \
+        "make -f - target 2>/dev/null" "" "" '
+.SUFFIXES: .xyz
+.xyz:
+        @echo xyz
+target: ;
+'
+cd .. || exit 1; rm -rf make.tempdir 2>/dev/null
+# Macros should be expanded before suffix substitution.  The suffixes
+# can be obtained by macro expansion.
+testing "make macro expansion and suffix substitution" \
+        "make -f -" "src1.o src2.o\n" "" '
+DOTC = .c
+DOTO = .o
+SRC1 = src1.c
+SRCS = $(SRC1) src2.c
+target:
+        @echo $(SRCS:$(DOTC)=$(DOTO))
+'
+# Indeed, everything after the <colon> can be obtained by macro
+# macro expansion.
+testing "make macro expansion and suffix substitution 2" \
+        "make -f -" "src1.o src2.o\n" "" '
+DOTS = .c=.o
+SRC1 = src1.c
+SRCS = $(SRC1) src2.c
+target:
+        @echo $(SRCS:$(DOTS))
+'
+# It should be possible for an inference rule to determine that a
+# prerequisite can be created using an explicit rule.
+mkdir make.tempdir && cd make.tempdir || exit 1
+testing "make inference rule with explicit rule for prerequisite" \
+        "make -f -" "touch x.p\ncat x.p >x.q\n" "" '
+.SUFFIXES: .p .q
+x.q:
+x.p:
+        touch $@
+.p.q:
+        cat $< >$@
+'
+cd .. || exit 1; rm -rf make.tempdir 2>/dev/null
+# Austin Group defect report 875 clarifies certain aspects of the
+# behaviour of inference rules.  Study of this resulted in a number
+# of changes to pdpmake, though this test passed anyway.
+mkdir make.tempdir && cd make.tempdir || exit 1
+touch test.j test.k
+testing "make proper handling of inference rules 1" \
+        "make -f -" \
+        ".j.l\n" "" '
+.SUFFIXES: .j .k .l
+.j.l:
+        @echo .j.l
+.k.l:
+        @echo .k.l
+test.l: test.k
+test.j:
+test.k:
+'
+cd .. || exit 1; rm -rf make.tempdir 2>/dev/null
+# Check that single-suffix inference rules work.
+mkdir make.tempdir && cd make.tempdir || exit 1
+touch test.sh
+testing "make single-suffix inference rule works" \
+        "make -f - -s; echo $?" \
+        "0\n" "" '
+test:
+'
+cd .. || exit 1; rm -rf make.tempdir 2>/dev/null
+# There was a bug where the failure of a build command didn't result
+# in make returning a non-zero exit status.
+testing "make return error if command fails" \
+        "make -f - >/dev/null 2>&1; test \$? -gt 0 && echo OK" "OK\n" "" '
+target:
+        @exit 42
+'
+# An equal sign in a command on a target rule was detected as a
+# macro assignment.
+testing "make equal sign in inline command" \
+        "make -f -" "a = a\n" "" '
+a = a
+target:;@echo a = $(a)
+'
+# Ensure an inline command on a target rule can be detected even if
+# the semicolon is obfuscated.
+testing "make equal sign in obfuscated inline command" \
+        "make -f -" "a = a\n" "" '
+a = a
+semi = ;
+target:$(semi)@echo a = $(a)
+'
+# When a build command fails and the '-k' option has been provided
+# (continue execution on error) no further commands should be executed
+# for the current target.
+testing "make failure of build command with -k" \
+        "make -k -f - 2>/dev/null" "OK\n" "" '
+all: bar baz
+bar:
+        @echo OK
+        @false
+        @echo Not reached
+baz:
+        @:
+'
+# Build commands with a '+' prefix are executed even with the -q option.
+testing "make execute build command with + prefix and -q" \
+        "make -q -f - 2>/dev/null" "OK\n" "" '
+all: bar
+bar:
+        @+echo OK
+'
+# The -t option touches files that are out-of-date unless the target
+# has no commands or they're already up-to-date.
+mkdir make.tempdir && cd make.tempdir || exit 1
+touch baz
+testing "make check -t option" \
+        "make -t -f - 2>/dev/null" "touch bar\n" "" '
+all: foo bar baz
+foo:
+bar:
+        @echo bar
+baz:
+        @echo baz
+'
+cd .. || exit 1; rm -rf make.tempdir 2>/dev/null
+# Build commands with a '+' prefix are executed even with the -t option.
+mkdir make.tempdir && cd make.tempdir || exit 1
+testing "make execute build command with + prefix and -t" \
+        "make -t -f - 2>/dev/null" "OK\n" "" '
+all: bar
+bar:
+        @+echo OK
+'
+cd .. || exit 1; rm -rf make.tempdir 2>/dev/null
+# A macro created using ::= remembers it's of type immediate-expansion.
+# Immediate expansion also occurs when += is used to append to such a macro.
+testing "make appending to immediate-expansion macro" \
+        "make -f -" \
+        "hello 1 2 3\nhello 4 4\n" "" '
+world = 1
+hello ::= hello $(world)
+world = 2
+hello += $(world)
+world = 3
+hello += $(world)
+world = 4
+world = 1
+reset ::= hello $(world)
+world = 2
+# No longer immediate-expansion
+reset = hello $(world)
+world = 3
+reset += $(world)
+world = 4
+target:
+        @echo $(hello)
+        @echo $(reset)
+'
+# Since GNU make and bmake interpret := macro assignments differently,
+# POSIX has ::= for the GNU variant and :::= for BSD.
+testing "make different styles of := macro assignment" \
+        "make -f -" \
+        '65 a a $A\n' "" '
+A = a
+GNU ::= $A
+BSD1 :::= $A
+BSD2 :::= $$A
+A = 65
+target:
+        @echo '\''$(A) $(GNU) $(BSD1) $(BSD2)'\''
+'
+# Similar to the above but for macro assignments on the command line.
+# POSIX has ::= for the GNU variant and :::= for BSD.
+testing "make := macro assignment on command line" \
+        "make -f - A=a 'GNU::=\$A' 'BSD1:::=\$A' 'BSD2:::=\$\$A' A=65" \
+        '65 a a $A\n' "" '
+target:
+        @echo '\''$(A) $(GNU) $(BSD1) $(BSD2)'\''
+'
+# basic pattern macro expansion
+testing "make basic pattern macro expansion" \
+        "make -f -" \
+        "obj/util.o obj/main.o\n" "" '
+SRC = src/util.c src/main.c
+OBJ = $(SRC:src/%.c=obj/%.o)
+target:
+        @echo $(OBJ)
+'
+# pattern macro expansion; match any value
+testing "make pattern macro expansion; match any value" \
+        "make -f -" \
+        "any_value.o\n" "" '
+SRC = any_value
+OBJ = $(SRC:%=%.o)
+target:
+        @echo $(OBJ)
+'
+# pattern macro expansion with empty rvalue
+testing "make pattern macro expansion with empty rvalue" \
+        "make -f -" \
+        "\n" "" '
+SRC = util.c main.c
+OBJ = $(SRC:%.c=)
+target:
+        @echo $(OBJ)
+'
+# pattern macro expansion with multiple <percent> in rvalue
+# POSIX requires the first <percent> to be expanded, others
+# may or may not be expanded.  Permit either case.
+testing "make pattern macro expansion with multiple <percent> in rvalue" \
+        "make -f - | sed 's/mainmainmain/main%%/'" \
+        "main%%\n" "" '
+SRC = main.c
+OBJ = $(SRC:%.c=%%%)
+target:
+        @echo $(OBJ)
+'
+# pattern macro expansion; zero match
+testing "make pattern macro expansion; zero match" \
+        "make -f -" \
+        "nsnp\n" "" '
+WORD = osop
+REPL = $(WORD:os%op=ns%np)
+target:
+        @echo $(REPL)
+'
+# Check that MAKE will contain argv[0], e.g make in this case
+testing "make basic MAKE macro expansion" \
+        "make -f -" \
+        "make\n" "" '
+target:
+        @echo $(MAKE)
+'
+# Check that MAKE defined as environment variable will overwrite default MAKE
+testing "make MAKE macro expansion; overwrite with env macro" \
+        "MAKE=hello make -f -" \
+        "hello\n" "" '
+target:
+        @echo $(MAKE)
+'
+# Check that MAKE defined on the command-line will overwrite MAKE defined in
+# Makefile
+testing "make MAKE macro expansion; overwrite with command-line macro" \
+        "make -f - MAKE=hello" \
+        "hello\n" "" '
+MAKE = test
+target:
+        @echo $(MAKE)
+'
+# POSIX draft states that if make was invoked using relative path, MAKE must
+# contain absolute path, not just argv[0]
+testing "make MAKE macro expansion; turn relative path into absolute" \
+        "../runtest-tempdir-links/make -f -" \
+        "ok\n" "" '
+target:
+        @test -e "$(MAKE)" && test "$(MAKE)" = "$$(env which make)" && echo ok
+'
+# $? contains prerequisites newer than target, file2 in this case
+# $^ has all prerequisites, file1 and file2
+touch -t 202206171200 file1
+touch -t 202206171201 target
+touch -t 202206171202 file2
+testing "make compare \$? and \$^ internal macros" \
+        "make -f -" \
+        "file2\nfile1 file2\n" "" '
+target: file1 file2
+        @echo $?
+        @echo $^
+'
+rm -f target file1 file2
+# Phony targets are executed (once) even if a matching file exists.
+# A .PHONY target with no prerequisites is ignored.
+touch -t 202206171201 target
+testing "make phony target" \
+        "make -f -" \
+        "phony\n" "" '
+.PHONY: target
+.PHONY:
+target:
+        @echo phony
+'
+rm -f target
+# Phony targets aren't touched with -t
+testing "make phony target not touched" \
+        "make -t -f - >/dev/null && test -f target && echo target" \
+        "" "" '
+.PHONY: target
+target:
+        @:
+'
+rm -f target
+# Include files are created or brought up-to-date
+mkdir make.tempdir && cd make.tempdir || exit 1
+testing "make create include file" \
+        "make -f -" \
+        "made\n" "" '
+target:
+        @echo $(VAR)
+mk:
+        @echo "VAR = made" >mk
+include mk
+'
+cd .. || exit 1; rm -rf make.tempdir 2>/dev/null
+# Include files are created or brought up-to-date even when the -n
+# option is given.
+mkdir make.tempdir && cd make.tempdir || exit 1
+testing "make create include file even with -n" \
+        "make -n -f -" \
+        "echo made\n" "" '
+target:
+        @echo $(VAR)
+mk:
+        @echo "VAR = made" >mk
+include mk
+'
+cd .. || exit 1; rm -rf make.tempdir 2>/dev/null
+# Failure to create an include file isn't an error.  (Provided the
+# include line is ignoring non-existent files.)
+testing "make failure to create include file is OK" \
+        "make -f -" \
+        "OK\n" "" '
+target:
+        @echo OK
+mk:
+        @:
+-include mk
+'
+# $^ skips duplicate prerequisites, $+ doesn't
+mkdir make.tempdir && cd make.tempdir || exit 1
+touch file1 file2 file3
+testing "make skip duplicate entries in \$^ but not \$+" \
+        "make -f -" \
+        "file1 file2 file3\nfile1 file2 file2 file3 file3\n" "" '
+target: file1 file2 file2 file3 file3
+        @echo $^
+        @echo $+
+'
+cd .. || exit 1; rm -rf make.tempdir 2>/dev/null
+# Assign the output of a shell command to a macro.
+testing "make shell assignment" \
+        "make -f -" \
+        "1 2 3   4\n" "" '
+hello != echo 1; echo 2; echo 3; echo; echo
+target:
+        @echo "$(hello) 4"
+'
+# Nested macro expansion is allowed.  This should be compatible
+# with other implementations.
+testing "make nested macro expansion" \
+        "make -f -" "0 bc\n1 d\n2\n3\n4 bcd\n5 bcd\n" "" '
+a = b
+b = c
+c = d
+$(a:.q=.v)$(b:.z=.v) = bc
+bcd = bcd
+target:
+        @echo 0 $(bc)
+        @echo 1 $($($(a)))
+        @echo 2 $($(a) $(b) $(c))
+        @echo 3 $($a $b $c)
+        @echo 4 $($(a)$(b)$(c))
+        @echo 5 $($a$b$c)
+'
+# .WAIT is allowed as a prerequisite.  Since parallel builds aren't
+# implemented it doesn't have any effect.
+mkdir make.tempdir && cd make.tempdir || exit 1
+touch file1 file2
+testing "make .WAIT is allowed as a prerequisite" \
+        "make -f -" \
+        "file1 file2\n" "" '
+target: file1 .WAIT file2
+        @echo $?
+'
+cd .. || exit 1; rm -rf make.tempdir 2>/dev/null
+# Escaped newlines inside macro expansions in commands get different
+# treatment than those outside.  In POSIX 2017 the output is 'a b ab'.
+testing "make replace escaped NL in macro in command with space" \
+        "make -f -" \
+        "a b a b\n" "" '
+M=word
+N=${M:word=a\\
+b}
+target:
+        @echo ${N} ${M:word=a\\
+b}
+'
+# The CURDIR macro is supported in POSIX 2024.
+testing "make CURDIR macro" \
+        "make -f -" \
+        "OK\n" "" '
+target:
+        @test "$(CURDIR)" = "$$(pwd -P)" && echo OK
+'
+# The CURDIR environment variable doesn't affect the macro
+export CURDIR=/you/are/here
+testing "make CURDIR macro not affected by environment" \
+        "make -f -" \
+        "OK\n" "" '
+target:
+        @test "$(CURDIR)" != "/you/are/here" && echo OK
+'
+# The -e option makes the CURDIR macro match the environment
+testing "make with -e CURDIR macro is affected by the environment" \
+        "make -e -f -" \
+        "/you/are/here\n" "" '
+target:
+        @echo $(CURDIR)
+'
+unset CURDIR
+# The fix for an equal sign in an inline command on a target rule broke
+# a complex chain of macro assignments generated by autotools.
+testing "make complex chain of macro assignments" \
+        "make -f -" "flag 1\n" "" '
+FLAG_ = $(FLAG_$(VALUE))
+FLAG_0 = flag 0
+FLAG_1 = flag 1
+MYFLAG = $(FLAG_$(VALUE))
+VALUE = 1
+target:
+        @echo $(MYFLAG)
+'
+# POSIX 2024 permits additional characters in macro and target names
+testing "make allow - and / in target names, - in macro names" \
+        "make -f -" \
+        "/hello\nhel-lo\nmac-ro\n" "" '
+target: ./hello hel-lo
+        @echo $(mac-ro)
+./hello:
+        @echo /hello
+hel-lo:
+        @echo hel-lo
+mac-ro = mac-ro
+'
+testing "make double-colon rule" \
+        "make -f -" "target1\ntarget2\n" "" '
+target::
+        @echo target1
+target::
+        @echo target2
+'
+# There was a bug whereby the modification time of a file created by
+# double-colon rules wasn't correctly updated.  This test checks that
+# the bug is now fixed.
+mkdir make.tempdir && cd make.tempdir || exit 1
+touch -t 202206171200 file1
+touch -t 202206171201 intermediate
+touch -t 202206171202 target
+touch -t 202206171203 file2
+testing "make target depends on prerequisite updated by double-colon rule" \
+        "make -f -" \
+        "file2\n" "" '
+target: intermediate
+        @cat intermediate
+intermediate:: file1
+        @echo file1 >>intermediate
+intermediate:: file2
+        @echo file2 >>intermediate
+'
+cd .. || exit 1; rm -rf make.tempdir 2>/dev/null
+# Use chained inference rules to determine prerequisites.
+mkdir make.tempdir && cd make.tempdir || exit 1
+touch target.p
+testing "make chained inference rules" \
+        "make -s -f - target.s" \
+        "target.q\ntarget.r\ntarget.s\n" "" '
+.SUFFIXES: .p .q .r .s
+.p.q:
+        @cp $< $*.q
+        @echo $*.q
+.q.r:
+        @cp $< $*.r
+        @echo $*.r
+.r.s:
+        @cp $< $*.s
+        @echo $*.s
+'
+cd .. || exit 1; rm -rf make.tempdir 2>/dev/null
+# Suffixes with multiple periods are supported
+mkdir make.tempdir && cd make.tempdir || exit 1
+touch x.c.c
+testing "make support multi-period suffixes" \
+        "make -f -" "cat x.c.c >x.o.o\nx\n" "" '
+.SUFFIXES: .c.c .o.o
+x.o.o:
+.c.c.o.o:
+        cat $< >$@
+        @echo $*
+'
+cd .. || exit 1; rm -rf make.tempdir 2>/dev/null
+# Suffixes with no periods are supported
+mkdir make.tempdir && cd make.tempdir || exit 1
+touch filex
+testing "make support suffixes without any periods" \
+        "make -f -" "cp filex fileh\nfile\ncp filex filez\nfile\n" "" '
+.SUFFIXES: x h z
+all: fileh filez
+fileh:
+filez: filex
+        cp filex filez
+        @echo $*
+xh:
+        cp $< $@
+        @echo $*
+'
+cd .. || exit 1; rm -rf make.tempdir 2>/dev/null
+# make supports *, ? and [] wildcards in targets and prerequisites
+mkdir make.tempdir && cd make.tempdir || exit 1
+touch -t 202206171201 t1a t2aa t3b
+touch s1a s2aa s3b
+testing "make expand wildcards in filenames" \
+        "make -f - t1a t2aa t3b" \
+        "t1a s1a s2aa s3b\nt2aa s1a s2aa s3b\nt3b s1a s2aa s3b\n" "" '
+t1? t2* t3[abc]: s1? s2* s3[abc]
+        @echo $@ $?
+'
+cd .. || exit 1; rm -rf make.tempdir 2>/dev/null
+# A '#' character in a macro expansion doesn't start a comment
+testing "make hash in macro expansion isn't a comment" \
+        "make -f -" \
+        ": hash # hash\n" "" '
+HASH = hash
+hash = $(HASH:hash=#)
+target:
+        : hash $(hash) hash
+'
+# A '#' character can be escaped with a backslash
+testing "make backslash-escaped hash isn't a comment" \
+        "make -f -" \
+        ": hash # hash\n" "" '
+hash = \\#
+target:
+        : hash $(hash) hash
+'
+# A '#' character in a command line doesn't start a comment
+testing "make hash in command line isn't a comment" \
+        "make -f -" \
+        ": hash # hash\n" "" '
+target:
+        : hash # hash
+'
+# Austin Group defect report 875 (mentioned above) actually used
+# suffixes '.a .b .c'.  This doesn't matter in POSIX mode but it
+# caused a failure (now fixed) when chained inference rules were
+# allowed.  The '.a.c' and the built-in '.c.a' inference rules
+# resulted in a loop.
+mkdir make.tempdir && cd make.tempdir || exit 1
+touch test.a test.b
+testing "make proper handling of inference rules 2" \
+        "make -f -" \
+        ".a.c\n" "" '
+.SUFFIXES: .a .b .c
+.a.c:
+        @echo .a.c
+.b.c:
+        @echo .b.c
+test.c: test.b
+test.a:
+test.b:
+'
+cd .. || exit 1; rm -rf make.tempdir 2>/dev/null
+# Don't use the shell -e option when running commands.
+testing "make no shell -e option when running commands" \
+        "make -f -" "OK\n" "" '
+target:
+        @false; echo OK
+'
+# Macros and targets may be mixed on the command line
+testing "make allow mixed macros and targets" \
+        "make -f - FOO=foo foo BAR=bar bar" "foo\nbar\nfoo\nbar\n" "" '
+foo:
+        @echo $(FOO)
+        @echo $(BAR)
+bar:
+        @echo $(FOO)
+        @echo $(BAR)
+'
+# $* and $< are supported for target rules
+mkdir make.tempdir && cd make.tempdir || exit 1
+touch src.c src.h
+testing 'make support $* and $< for target rules' \
+        "make -f -" "src.c src.h\nsrc.o\nsrc\nsrc.c\n" "" '
+src.o: src.c src.h
+        @echo "$?"
+        @echo "$@"
+        @echo "$*"
+        @echo "$<"
+'
+cd .. || exit 1; rm -rf make.tempdir 2>/dev/null
+# ifeq/ifneq conditionals are supported
+testing 'make support ifeq and ifneq conditionals' \
+        "make -f -" "A OK\nB OK\n" "" '
+A = a
+B = b
+target:
+ifeq ($(A),a)
+        @echo A OK
+else
+        @echo A not OK
+endif
+ifneq "a" "$B"
+        @echo B OK
+endif
+'
+# An empty original suffix indicates that every word should have
+# the new suffix added.  If neither suffix is provided the words
+# remain unchanged.
+testing "make macro expansion and suffix substitution 3" \
+        "make -f -" "src1.c src2.c\nsrc1 src2\n" "" '
+SRCS = src1 src2
+target:
+        @echo $(SRCS:=.c)
+        @echo $(SRCS:=)
+'
+# Skip duplicate entries in $? and $^
+mkdir make.tempdir && cd make.tempdir || exit 1
+touch -t 202206171200 file1 file3
+touch -t 202206171201 target
+touch -t 202206171202 file2
+testing "make skip duplicate entries in \$? and \$^" \
+        "make -f -" \
+        "file2\nfile1 file2 file3\n" "" '
+target: file1 file2 file2 file3 file3
+        @echo $?
+        @echo $^
+'
+cd .. || exit 1; rm -rf make.tempdir 2>/dev/null
+# Skip duplicate entries in $? and $^, with each double-colon rule
+# handled separately
+mkdir make.tempdir && cd make.tempdir || exit 1
+touch -t 202206171200 file1 file3
+touch -t 202206171201 target
+touch -t 202206171202 file2
+testing "make skip duplicate entries: double-colon rules" \
+        "make -f -" \
+        "file2\nfile1 file3 file2\nfile2\nfile2 file3\n" "" '
+target:: file1 file3 file1 file2 file3
+        @echo $?
+        @echo $^
+target:: file2 file3 file3
+        @echo $?
+        @echo $^
+'
+cd .. || exit 1; rm -rf make.tempdir 2>/dev/null
+# Skip duplicate entries in $? and $^, with each double-colon rule
+# handled separately.  No prerequisites out-of-date in the first.
+mkdir make.tempdir && cd make.tempdir || exit 1
+touch -t 202206171200 file1 file3
+touch -t 202206171201 target
+touch -t 202206171202 file2
+testing "make skip duplicate entries: double-colon rules, only second invoked" \
+        "make -f -" \
+        "file2\nfile2 file3\n" "" '
+target:: file1 file3 file1 file3
+        @echo $?
+        @echo $^
+target:: file2 file3 file3
+        @echo $?
+        @echo $^
+'
+cd .. || exit 1; rm -rf make.tempdir 2>/dev/null
+# .DEFAULT rules with no commands or some prerequisites are ignored.
+# .DEFAULT rules with commands can be redefined.
+testing "make: .DEFAULT rule" \
+        "make -f - default" "default2\n" "" '
+.DEFAULT: ignored
+.DEFAULT:
+        @echo default1
+.DEFAULT:
+        @echo default2
+target:
+'
+testing "make: double-colon rule" \
+        "make -f -" "target1\ntarget2\n" "" '
+target::
+        @echo target1
+target::
+        @echo target2
+'
+# Double-colon rules didn't work properly if their target was phony:
+# - they didn't ignore the presence of a file matching the target name;
+# - they were also invoked as if they were a single-colon rule.
+mkdir make.tempdir && cd make.tempdir || exit 1
+touch -t 202206171200 file1
+touch -t 202206171201 target
+testing "make phony target of double-colon rule" \
+        "make -f - 2>&1" \
+        "unconditional\nconditional\n" "" '
+.PHONY: target
+target::
+        @echo unconditional
+target:: file1
+        @echo conditional
+file1:
+        @touch file1
+'
+cd .. || exit 1; rm -rf make.tempdir 2>/dev/null
+# GNU make and BSD make don't allow the use of inference rules
+# for phony targets.  In POSIX mode the output is "phony.xyz\n".
+mkdir make.tempdir && cd make.tempdir || exit 1
+touch phony.xyz
+testing "make don't use inference rule for phony target" \
+        "make -f -" "make: nothing to be done for phony\n" "" '
+.PHONY: phony
+.SUFFIXES: .xyz
+.xyz:
+        @echo $<
+phony:
+'
+cd .. || exit 1; rm -rf make.tempdir 2>/dev/null
+exit $FAILCOUNT
diff --git a/testsuite/od.tests b/testsuite/od.tests
index 4f245a7e8..c863bf2e8 100755
--- a/testsuite/od.tests
+++ b/testsuite/od.tests
@@ -61,7 +61,8 @@ testing "od -a (DESKTOP)" \
 "\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff"
 SKIP=
-testing "od -B" \
+$little_endian || SKIP=1
+testing "od -B (little-endian)" \
        "od -B" \
 "\
 0000000 001001 005003 041101 177103
@@ -70,6 +71,16 @@ testing "od -B" \
        "" "$input"
 SKIP=
+$little_endian && SKIP=1
+testing "od -B (big-endian)" \
+        "od -B" \
+"\
+0000000 000402 001412 040502 041776
+0000010
+" \
+       "" "$input"
+SKIP=
 $little_endian || SKIP=1
 testing "od -o (little-endian)" \
        "od -o" \
diff --git a/testsuite/runtest b/testsuite/runtest
index 44f9cd1a1..adbcb1178 100755
--- a/testsuite/runtest
+++ b/testsuite/runtest
@@ -99,6 +99,20 @@ if [ x"$1" = x"-v" ]; then
        shift
 fi
+if [ -f "$bindir/busybox.exe" ]; then
+        suffix=".exe"
+        lnflag=""
+        # Some tests require /bin/echo and /bin/true exist
+        test ! -d /tmp && mkdir /tmp
+        test ! -d /bin && mkdir /bin
+        test ! -f /bin/echo.exe && cp "$bindir/busybox.exe" /bin/echo.exe
+        test ! -f /bin/true.exe && cp "$bindir/busybox.exe" /bin/true.exe
+else
+        suffix=""
+        lnflag="-s"
+fi
 implemented=$(
        printf "busybox " # always implemented
        "$bindir/busybox" 2>&1 |
@@ -128,7 +142,7 @@ for i in $implemented; do
        # Note: if $LINKSDIR/applet exists, we do not overwrite it.
        # Useful if one wants to run tests against a standard utility,
        # not an applet.
-        ln -s "$bindir/busybox" "$LINKSDIR/$i" 2>/dev/null
+        ln $lnflag "$bindir/busybox$suffix" "$LINKSDIR/$i$suffix" 2>/dev/null
 done
 # Set up option flags so tests can be selective.
@@ -146,7 +160,7 @@ for applet in $applets; do
        # Is this a new-style test?
        if [ -f "$applet.tests" ]; then
-                if [ ! -e "$LINKSDIR/$applet" ]; then
+                if [ ! -e "$LINKSDIR/$applet$suffix" ]; then
                        # (avoiding bash'ism "${applet:0:4}")
                        if ! echo "$applet" | grep "^all_" >/dev/null; then
                                echo "SKIPPED: $applet (not built)"
diff --git a/testsuite/sh.tests b/testsuite/sh.tests
new file mode 100755
index 000000000..0eccf20bc
--- /dev/null
+++ b/testsuite/sh.tests
@@ -0,0 +1,118 @@
+#!/bin/sh
+#
+# Test sh scripts
+#
+# Copyright 2019 by STMicroelectronics
+# Licensed under GPLv2, see file LICENSE in this source tree.
+. ./testing.sh
+test -f "$bindir/.config" && . "$bindir/.config"
+# testing "test name" "options" "expected result" "file input" "stdin"
+optional PLATFORM_MINGW32
+# Test case
+testing "shebang" \
+        "uudecode; sh -c './shebang.sh'; echo \$?" \
+        "Hello world
+0
+" \
+"" "\
+begin-base64 755 shebang.sh
+IyEvYmluL3NoCmVjaG8gIkhlbGxvIHdvcmxkIgo=
+====
+"
+rm -f shebang.sh
+# Test case
+testing "shebang with whitespace" \
+        "uudecode; sh -c './shebang_trailing_space.sh'; echo \$?" \
+        "Hello world
+0
+" \
+"" "\
+begin-base64 755 shebang_trailing_space.sh
+IyEvYmluL3NoIAplY2hvICJIZWxsbyB3b3JsZCIK
+====
+"
+rm -f shebang_trailing_space.sh
+# Test case
+testing "shebang with argument" \
+        "uudecode; sh -c './shebang_argument.sh'; echo \$?" \
+        "Hello world
+0
+" \
+"" "\
+begin-base64 755 shebang_argument.sh
+IyEvYmluL3NoIC0KZWNobyAiSGVsbG8gd29ybGQiCg==
+====
+"
+rm -f shebang_argument.sh
+# Test case
+testing "shebang with leading whitespace and argument" \
+       "uudecode; sh -c './shebang_leading_space_argument.sh'; echo \$?" \
+       "Hello world
+0
+" \
+"" "\
+begin-base64 755 shebang_leading_space_argument.sh
+IyEvYmluL3NoICAtCmVjaG8gIkhlbGxvIHdvcmxkIgo=
+====
+"
+rm -f shebang_leading_space_argument.sh
+# Test case
+testing "shebang with argument and trailing whitespace" \
+        "uudecode; sh -c './shebang_argument_trailing_space.sh'; echo \$?" \
+        "Hello world
+0
+" \
+"" "\
+begin-base64 755 shebang_argument_trailing_space.sh
+IyEvYmluL3NoIC0gCmVjaG8gIkhlbGxvIHdvcmxkIgo=
+====
+"
+rm -f shebang_argument_trailing_space.sh
+# Test case
+testing "shebang with leading whitespace, argument and trailing whitespace" \
+       "uudecode; sh -c './shebang_leading_argument_trailing_space.sh'; echo \$?" \
+       "Hello world
+0
+" \
+"" "\
+begin-base64 755 shebang_leading_argument_trailing_space.sh
+IyEvYmluL3NoICAtIAplY2hvICJIZWxsbyB3b3JsZCIK
+====
+"
+rm -f shebang_leading_argument_trailing_space.sh
+testing "sh remove CRs from string being evaluated" \
+        "sh -c \"$(printf 'set -e\r\necho Hello world\r\n')\"" \
+        "Hello world\n" "" ""
+testing "sh preserve lone CRs during field splitting" \
+        "sh input" \
+        "Hello\r world\n" "echo \$(printf \"Hello\\\\r\\\\r\\\\nworld\\\\r\\\\n\")" ""
+testing "sh read with CRLF" \
+        "printf '1 2\\r\\n' | { read var; printf \"\${var}\\\\n\"; }" \
+        "1 2\n" "" ""
+testing "sh read with CR" \
+        "printf '1\\r2\\r\\n' | { read var; printf \"\${var}\\\\n\"; }" \
+        "1\r2\n" "" ""
+testing "sh read with \\CRLF" \
+        "printf '1\\\\\r\\n2\\r\\n' | { read var; printf \"\${var}\\\\n\"; }" \
+        "12\n" "" ""
+testing "sh read with \\CR" \
+        "printf '1\\\\\r2\\r\\n' | { read var; printf \"\${var}\\\\n\"; }" \
+        "1\r2\n" "" ""
+SKIP=
+exit $FAILCOUNT
diff --git a/testsuite/wget/wget-handles-https b/testsuite/wget/wget-handles-https
new file mode 100644
index 000000000..11915f42f
--- /dev/null
+++ b/testsuite/wget/wget-handles-https
@@ -0,0 +1,4 @@
+test x"$SKIP_INTERNET_TESTS" != x"" && exit
+busybox wget -q -O foo https://www.google.com/
+test -s foo