From 92549250f36f91f4492c296bb227cfca83d5c4fe Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Sat, 8 Jun 2019 13:04:44 +0200 Subject: [PATCH] expand,unexpand: drop broken test, add FIXME comment Signed-off-by: Denys Vlasenko --- coreutils/expand.c | 2 + testsuite/expand/expand-works-like-GNU | 20 -------- testsuite/unexpand/unexpand-works-like-GNU | 56 ---------------------- 3 files changed, 2 insertions(+), 76 deletions(-) delete mode 100644 testsuite/expand/expand-works-like-GNU delete mode 100644 testsuite/unexpand/unexpand-works-like-GNU 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 -- 2.25.1