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-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.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 { | |||
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 |
67 | static void expand(FILE *file, unsigned tab_size, unsigned opt) | 69 | static 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 | |||
3 | rm -f foo bar | ||
4 | $ECHO -e "\ty" | expand -t 3 ../../busybox > foo | ||
5 | $ECHO -e "\ty" | busybox unexpand -t 3 ../../busybox > bar | ||
6 | set +e | ||
7 | test ! -f foo -a -f bar | ||
8 | if [ $? = 0 ] ; then | ||
9 | set -e | ||
10 | diff -q foo bar | ||
11 | fi | ||
12 | rm -f foo bar | ||
13 | $ECHO -e "\ty\tx" | expand -it 3 ../../busybox > foo | ||
14 | $ECHO -e "\ty\tx" | busybox unexpand -it 3 ../../busybox > bar | ||
15 | set +e | ||
16 | test ! -f foo -a -f bar | ||
17 | if [ $? = 0 ] ; then | ||
18 | set -e | ||
19 | diff -q foo bar | ||
20 | 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 @@ | |||
1 | # coreutils 8.25 often says "input line is too long" | ||
2 | # on ELF executables. In this case, do not run the test: | ||
3 | unexpand ../../busybox >/dev/null || exit 0 | ||
4 | |||
5 | rm -f foo bar | ||
6 | echo " y" | unexpand ../../busybox > foo | ||
7 | echo " y" | busybox unexpand ../../busybox > bar | ||
8 | set +e | ||
9 | test ! -f foo -a -f bar | ||
10 | if [ $? = 0 ] ; then | ||
11 | set -e | ||
12 | diff -q foo bar | ||
13 | fi | ||
14 | rm -f foo bar | ||
15 | echo " y" | unexpand ../../busybox > foo | ||
16 | echo " y" | busybox unexpand ../../busybox > bar | ||
17 | set +e | ||
18 | test ! -f foo -a -f bar | ||
19 | if [ $? = 0 ] ; then | ||
20 | set -e | ||
21 | diff -q foo bar | ||
22 | fi | ||
23 | echo " y y" | unexpand ../../busybox > foo | ||
24 | echo " y y" | busybox unexpand ../../busybox > bar | ||
25 | set +e | ||
26 | test ! -f foo -a -f bar | ||
27 | if [ $? = 0 ] ; then | ||
28 | set -e | ||
29 | diff -q foo bar | ||
30 | fi | ||
31 | rm -f foo bar | ||
32 | echo " y y" | unexpand ../../busybox > foo | ||
33 | echo " y y" | busybox unexpand ../../busybox > bar | ||
34 | set +e | ||
35 | test ! -f foo -a -f bar | ||
36 | if [ $? = 0 ] ; then | ||
37 | set -e | ||
38 | diff -q foo bar | ||
39 | fi | ||
40 | echo " y y" | unexpand -a ../../busybox > foo | ||
41 | echo " y y" | busybox unexpand -a ../../busybox > bar | ||
42 | set +e | ||
43 | test ! -f foo -a -f bar | ||
44 | if [ $? = 0 ] ; then | ||
45 | set -e | ||
46 | diff -q foo bar | ||
47 | fi | ||
48 | rm -f foo bar | ||
49 | echo " y y" | unexpand -a ../../busybox > foo | ||
50 | echo " y y" | busybox unexpand -a ../../busybox > bar | ||
51 | set +e | ||
52 | test ! -f foo -a -f bar | ||
53 | if [ $? = 0 ] ; then | ||
54 | set -e | ||
55 | diff -q foo bar | ||
56 | fi | ||