Merge branch 'busybox' into merge

3 files changed, 6 insertions, 76 deletions

diff --git a/testsuite/awk.tests b/testsuite/awk.tests
index 0db6a26e4..a7a533ba0 100755
--- a/testsuite/awk.tests
+++ b/testsuite/awk.tests
@@ -347,14 +347,20 @@ testing "awk continue" \
         "" \
         'BEGIN { if (1) continue; else a = 1 }'
 
+optional FEATURE_AWK_GNU_EXTENSIONS
 testing "awk handles invalid for loop" \
         "awk -e '{ for() }' 2>&1" "awk: cmd. line:1: Unexpected token\n" "" ""
+SKIP=
 
+optional FEATURE_AWK_GNU_EXTENSIONS
 testing "awk handles colon not preceded by ternary" \
         "awk -e foo:bar: 2>&1" "awk: cmd. line:1: Unexpected token\n" "" ""
+SKIP=
 
+optional FEATURE_AWK_GNU_EXTENSIONS
 testing "awk errors on missing delete arg" \
         "awk -e '{delete}' 2>&1" "awk: cmd. line:1: Too few arguments\n" "" ""
+SKIP=
 
 # testing "description" "command" "result" "infile" "stdin"
 testing 'awk negative field access' \
diff --git a/testsuite/expand/expand-works-like-GNU b/testsuite/expand/expand-works-like-GNU
deleted file mode 100644
index b0278d88d..000000000
--- a/testsuite/expand/expand-works-like-GNU
+++ /dev/null
@@ -1,20 +0,0 @@
-# FEATURE: CONFIG_UNEXPAND
-
-rm -f foo bar
-$ECHO -e "\ty" | expand -t 3 ../../busybox > foo
-$ECHO -e "\ty" | busybox unexpand -t 3 ../../busybox > bar
-set +e
-test ! -f foo -a -f bar
-if [ $? = 0 ] ; then
-        set -e
-        diff -q foo bar
-fi
-rm -f foo bar
-$ECHO -e "\ty\tx" | expand -it 3 ../../busybox > foo
-$ECHO -e "\ty\tx" | busybox unexpand -it 3 ../../busybox > bar
-set +e
-test ! -f foo -a -f bar
-if [ $? = 0 ] ; then
-        set -e
-        diff -q foo bar
-fi
diff --git a/testsuite/unexpand/unexpand-works-like-GNU b/testsuite/unexpand/unexpand-works-like-GNU
deleted file mode 100644
index 111b277b5..000000000
--- a/testsuite/unexpand/unexpand-works-like-GNU
+++ /dev/null
@@ -1,56 +0,0 @@
-# coreutils 8.25 often says "input line is too long"
-# on ELF executables. In this case, do not run the test:
-unexpand ../../busybox >/dev/null || exit 0
-
-rm -f foo bar
-echo "       y" | unexpand ../../busybox > foo
-echo "       y" | busybox unexpand ../../busybox > bar
-set +e
-test ! -f foo -a -f bar
-if [ $? = 0 ] ; then
-        set -e
-        diff -q foo bar
-fi
-rm -f foo bar
-echo "        y" | unexpand ../../busybox > foo
-echo "        y" | busybox unexpand ../../busybox > bar
-set +e
-test ! -f foo -a -f bar
-if [ $? = 0 ] ; then
-        set -e
-        diff -q foo bar
-fi
-echo "       y       y" | unexpand ../../busybox > foo
-echo "       y       y" | busybox unexpand ../../busybox > bar
-set +e
-test ! -f foo -a -f bar
-if [ $? = 0 ] ; then
-        set -e
-        diff -q foo bar
-fi
-rm -f foo bar
-echo "        y        y" | unexpand ../../busybox > foo
-echo "        y        y" | busybox unexpand ../../busybox > bar
-set +e
-test ! -f foo -a -f bar
-if [ $? = 0 ] ; then
-        set -e
-        diff -q foo bar
-fi
-echo "       y       y" | unexpand -a ../../busybox > foo
-echo "       y       y" | busybox unexpand -a ../../busybox > bar
-set +e
-test ! -f foo -a -f bar
-if [ $? = 0 ] ; then
-        set -e
-        diff -q foo bar
-fi
-rm -f foo bar
-echo "        y        y" | unexpand -a ../../busybox > foo
-echo "        y        y" | busybox unexpand -a ../../busybox > bar
-set +e
-test ! -f foo -a -f bar
-if [ $? = 0 ] ; then
-        set -e
-        diff -q foo bar
-fi