diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2019-06-08 13:04:44 +0200 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2019-06-08 13:04:44 +0200 |
| commit | 92549250f36f91f4492c296bb227cfca83d5c4fe (patch) | |
| tree | 8b93d86151eff8f21e14cdb046f988dafd161437 | |
| parent | 22cc92833f98450f37a2e82e4a6a36c418b4cc67 (diff) | |
| download | busybox-92549250f36f91f4492c296bb227cfca83d5c4fe.tar.gz | |
expand,unexpand: drop broken test, add FIXME comment
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| -rw-r--r-- | coreutils/expand.c | 2 | ||||
| -rw-r--r-- | testsuite/expand/expand-works-like-GNU | 20 | ||||
| -rw-r--r-- | testsuite/unexpand/unexpand-works-like-GNU | 56 |
3 files changed, 2 insertions, 76 deletions
diff --git a/coreutils/expand.c b/coreutils/expand.c index f7e4619f9..8d064db5e 100644 --- a/coreutils/expand.c +++ b/coreutils/expand.c @@ -63,6 +63,8 @@ enum { OPT_ALL = 1 << 2, }; +//FIXME: does not work properly with input containing NULs + #if ENABLE_EXPAND static void expand(FILE *file, unsigned tab_size, unsigned opt) { 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 |