aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2019-06-08 13:04:44 +0200
committerDenys Vlasenko <vda.linux@googlemail.com>2019-06-08 13:04:44 +0200
commit92549250f36f91f4492c296bb227cfca83d5c4fe (patch)
tree8b93d86151eff8f21e14cdb046f988dafd161437
parent22cc92833f98450f37a2e82e4a6a36c418b4cc67 (diff)
downloadbusybox-w32-92549250f36f91f4492c296bb227cfca83d5c4fe.tar.gz
busybox-w32-92549250f36f91f4492c296bb227cfca83d5c4fe.tar.bz2
busybox-w32-92549250f36f91f4492c296bb227cfca83d5c4fe.zip
expand,unexpand: drop broken test, add FIXME comment
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--coreutils/expand.c2
-rw-r--r--testsuite/expand/expand-works-like-GNU20
-rw-r--r--testsuite/unexpand/unexpand-works-like-GNU56
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 {
63 OPT_ALL = 1 << 2, 63 OPT_ALL = 1 << 2,
64}; 64};
65 65
66//FIXME: does not work properly with input containing NULs
67
66#if ENABLE_EXPAND 68#if ENABLE_EXPAND
67static void expand(FILE *file, unsigned tab_size, unsigned opt) 69static void expand(FILE *file, unsigned tab_size, unsigned opt)
68{ 70{
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 @@
1# FEATURE: CONFIG_UNEXPAND
2
3rm -f foo bar
4$ECHO -e "\ty" | expand -t 3 ../../busybox > foo
5$ECHO -e "\ty" | busybox unexpand -t 3 ../../busybox > bar
6set +e
7test ! -f foo -a -f bar
8if [ $? = 0 ] ; then
9 set -e
10 diff -q foo bar
11fi
12rm -f foo bar
13$ECHO -e "\ty\tx" | expand -it 3 ../../busybox > foo
14$ECHO -e "\ty\tx" | busybox unexpand -it 3 ../../busybox > bar
15set +e
16test ! -f foo -a -f bar
17if [ $? = 0 ] ; then
18 set -e
19 diff -q foo bar
20fi
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 @@
1# coreutils 8.25 often says "input line is too long"
2# on ELF executables. In this case, do not run the test:
3unexpand ../../busybox >/dev/null || exit 0
4
5rm -f foo bar
6echo " y" | unexpand ../../busybox > foo
7echo " y" | busybox unexpand ../../busybox > bar
8set +e
9test ! -f foo -a -f bar
10if [ $? = 0 ] ; then
11 set -e
12 diff -q foo bar
13fi
14rm -f foo bar
15echo " y" | unexpand ../../busybox > foo
16echo " y" | busybox unexpand ../../busybox > bar
17set +e
18test ! -f foo -a -f bar
19if [ $? = 0 ] ; then
20 set -e
21 diff -q foo bar
22fi
23echo " y y" | unexpand ../../busybox > foo
24echo " y y" | busybox unexpand ../../busybox > bar
25set +e
26test ! -f foo -a -f bar
27if [ $? = 0 ] ; then
28 set -e
29 diff -q foo bar
30fi
31rm -f foo bar
32echo " y y" | unexpand ../../busybox > foo
33echo " y y" | busybox unexpand ../../busybox > bar
34set +e
35test ! -f foo -a -f bar
36if [ $? = 0 ] ; then
37 set -e
38 diff -q foo bar
39fi
40echo " y y" | unexpand -a ../../busybox > foo
41echo " y y" | busybox unexpand -a ../../busybox > bar
42set +e
43test ! -f foo -a -f bar
44if [ $? = 0 ] ; then
45 set -e
46 diff -q foo bar
47fi
48rm -f foo bar
49echo " y y" | unexpand -a ../../busybox > foo
50echo " y y" | busybox unexpand -a ../../busybox > bar
51set +e
52test ! -f foo -a -f bar
53if [ $? = 0 ] ; then
54 set -e
55 diff -q foo bar
56fi