diff options
| author | Chen Qi | 2018-11-21 10:19:28 +0800 |
|---|---|---|
| committer | Denys Vlasenko | 2018-11-27 16:57:36 +0100 |
| commit | 572dfb8e78323b9837f7c5e3369ee233a440b8f2 (patch) | |
| tree | 3d44f3c045040e1b329bd2571a152b49d9f74c64 | |
| parent | 71df2d3589e3e682cd6770f41f0b184841b78702 (diff) | |
| download | busybox-572dfb8e78323b9837f7c5e3369ee233a440b8f2.zip busybox-572dfb8e78323b9837f7c5e3369ee233a440b8f2.tar.gz | |
testsuite: check CONFIG_DESKTOP before using 'od -t'
The '-t' option for od is enabled by CONFIG_DESKTOP. So
check this config before using 'od -t' in test cases.
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| -rw-r--r-- | testsuite/echo/echo-prints-dash | 1 | ||||
| -rw-r--r-- | testsuite/echo/echo-prints-non-opts | 1 | ||||
| -rw-r--r-- | testsuite/echo/echo-prints-slash-zero | 2 | ||||
| -rw-r--r-- | testsuite/echo/echo-prints-slash_00041 | 2 | ||||
| -rw-r--r-- | testsuite/echo/echo-prints-slash_0041 | 2 | ||||
| -rw-r--r-- | testsuite/echo/echo-prints-slash_041 | 2 | ||||
| -rw-r--r-- | testsuite/echo/echo-prints-slash_41 | 2 |
7 files changed, 7 insertions, 5 deletions
diff --git a/testsuite/echo/echo-prints-dash b/testsuite/echo/echo-prints-dash index ddcdbad..f1f31a0 100644 --- a/testsuite/echo/echo-prints-dash +++ b/testsuite/echo/echo-prints-dash @@ -1 +1,2 @@ +# FEATURE: CONFIG_DESKTOP test "`busybox echo - | od -t x1 | head -n 1`" = "0000000 2d 0a" diff --git a/testsuite/echo/echo-prints-non-opts b/testsuite/echo/echo-prints-non-opts index c7d1e20..4e642a1 100644 --- a/testsuite/echo/echo-prints-non-opts +++ b/testsuite/echo/echo-prints-non-opts @@ -1 +1,2 @@ +# FEATURE: CONFIG_DESKTOP test "`busybox echo -neEZ | od -t x1 | head -n 1`" = "0000000 2d 6e 65 45 5a 0a" diff --git a/testsuite/echo/echo-prints-slash-zero b/testsuite/echo/echo-prints-slash-zero index d97ed8e..948f899 100644 --- a/testsuite/echo/echo-prints-slash-zero +++ b/testsuite/echo/echo-prints-slash-zero @@ -1,3 +1,3 @@ -# FEATURE: CONFIG_FEATURE_FANCY_ECHO +# FEATURE: CONFIG_FEATURE_FANCY_ECHO CONFIG_DESKTOP test "`busybox echo -e -n 'msg\n\0' | od -t x1 | head -n 1`" = "0000000 6d 73 67 0a 00" diff --git a/testsuite/echo/echo-prints-slash_00041 b/testsuite/echo/echo-prints-slash_00041 index 9cffabd..7ea217b 100644 --- a/testsuite/echo/echo-prints-slash_00041 +++ b/testsuite/echo/echo-prints-slash_00041 @@ -1,3 +1,3 @@ -# FEATURE: CONFIG_FEATURE_FANCY_ECHO +# FEATURE: CONFIG_FEATURE_FANCY_ECHO CONFIG_DESKTOP test "`busybox echo -ne '\00041z' | od -t x1 | head -n 1`" = "0000000 04 31 7a" diff --git a/testsuite/echo/echo-prints-slash_0041 b/testsuite/echo/echo-prints-slash_0041 index b07429d..941faca 100644 --- a/testsuite/echo/echo-prints-slash_0041 +++ b/testsuite/echo/echo-prints-slash_0041 @@ -1,3 +1,3 @@ -# FEATURE: CONFIG_FEATURE_FANCY_ECHO +# FEATURE: CONFIG_FEATURE_FANCY_ECHO CONFIG_DESKTOP test "`busybox echo -ne '\0041z' | od -t x1 | head -n 1`" = "0000000 21 7a" diff --git a/testsuite/echo/echo-prints-slash_041 b/testsuite/echo/echo-prints-slash_041 index 1d70cec..60cbfca 100644 --- a/testsuite/echo/echo-prints-slash_041 +++ b/testsuite/echo/echo-prints-slash_041 @@ -1,3 +1,3 @@ -# FEATURE: CONFIG_FEATURE_FANCY_ECHO +# FEATURE: CONFIG_FEATURE_FANCY_ECHO CONFIG_DESKTOP test "`busybox echo -ne '\041z' | od -t x1 | head -n 1`" = "0000000 21 7a" diff --git a/testsuite/echo/echo-prints-slash_41 b/testsuite/echo/echo-prints-slash_41 index 6d8999b..afd7c36 100644 --- a/testsuite/echo/echo-prints-slash_41 +++ b/testsuite/echo/echo-prints-slash_41 @@ -1,3 +1,3 @@ -# FEATURE: CONFIG_FEATURE_FANCY_ECHO +# FEATURE: CONFIG_FEATURE_FANCY_ECHO CONFIG_DESKTOP test "`busybox echo -ne '\41z' | od -t x1 | head -n 1`" = "0000000 21 7a" |