apply post-1.14.2 patches

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

5 files changed, 20 insertions, 10 deletions

diff --git a/testsuite/ls/ls-1-works b/testsuite/ls/ls-1-works
index 8ad484fc3..885694920 100644
--- a/testsuite/ls/ls-1-works
+++ b/testsuite/ls/ls-1-works
@@ -1,4 +1,4 @@
 [ -n "$d" ] || d=..
-ls -1 "$d" > logfile.gnu
-busybox ls -1 "$d" > logfile.bb
-cmp logfile.gnu logfile.bb
+LC_ALL=C ls -1 "$d" > logfile.gnu
+LC_ALL=C busybox ls -1 "$d" > logfile.bb
+diff -ubw logfile.gnu logfile.bb
diff --git a/testsuite/ls/ls-h-works b/testsuite/ls/ls-h-works
index 7331262c9..0c83f7cc5 100644
--- a/testsuite/ls/ls-h-works
+++ b/testsuite/ls/ls-h-works
@@ -1,4 +1,4 @@
 [ -n "$d" ] || d=..
-ls -h "$d" > logfile.gnu
-busybox ls -h "$d" > logfile.bb
-cmp logfile.gnu logfile.bb
+LC_ALL=C ls -h "$d" > logfile.gnu
+LC_ALL=C busybox ls -h "$d" > logfile.bb
+diff -ubw logfile.gnu logfile.bb
diff --git a/testsuite/ls/ls-l-works b/testsuite/ls/ls-l-works
index efc2b196e..1bad34bcf 100644
--- a/testsuite/ls/ls-l-works
+++ b/testsuite/ls/ls-l-works
@@ -1,4 +1,4 @@
 [ -n "$d" ] || d=..
 LC_ALL=C ls -l "$d" > logfile.gnu
-busybox ls -l "$d" > logfile.bb
-diff -w logfile.gnu logfile.bb
+LC_ALL=C busybox ls -l "$d" > logfile.bb
+diff -ubw logfile.gnu logfile.bb
diff --git a/testsuite/ls/ls-s-works b/testsuite/ls/ls-s-works
index 6c8bf3627..0a9d7526f 100644
--- a/testsuite/ls/ls-s-works
+++ b/testsuite/ls/ls-s-works
@@ -1,4 +1,4 @@
 [ -n "$d" ] || d=..
 LC_ALL=C ls -1s "$d" > logfile.gnu
-busybox ls -1s "$d" > logfile.bb
-cmp logfile.gnu logfile.bb
+LC_ALL=C busybox ls -1s "$d" > logfile.bb
+diff -ubw logfile.gnu logfile.bb
diff --git a/testsuite/test.tests b/testsuite/test.tests
index d4be949ec..b7c84d9b2 100755
--- a/testsuite/test.tests
+++ b/testsuite/test.tests
@@ -21,6 +21,11 @@ testing "test '': should be false (1)" \
         "1\n" \
         "" ""
 
+testing "test !: should be true (0)" \
+        "busybox test !; echo \$?" \
+        "0\n" \
+        "" ""
+
 testing "test a: should be true (0)" \
         "busybox test a; echo \$?" \
         "0\n" \
@@ -51,6 +56,11 @@ testing "test -lt = -gt: should be false (1)" \
         "1\n" \
         "" ""
 
+testing "test a -a !: should be true (0)" \
+        "busybox test a -a !; echo \$?" \
+        "0\n" \
+        "" ""
+
 testing "test -f = a -o b: should be true (0)" \
         "busybox test -f = a -o b; echo \$?" \
         "0\n" \