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>

diff --git a/testsuite/echo/echo-prints-dash b/testsuite/echo/echo-prints-dash
index ddcdbadf7e556ec33c1ddca555117564f677b783..f1f31a034e200877f8a7aff1ff24eec0a24b038e 100644 (file)
--- 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 c7d1e201a4f5a0b2c1375980db3a1170af69d9f7..4e642a143ad08e870db32bbec1ecafd9fed6a6a5 100644 (file)
--- 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 d97ed8e661ad2a5bb3c9814d72d5f767c18bc914..948f899da12c6278037745d90279789e5edac517 100644 (file)
--- 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 9cffabde0cc0a25ea0cfb68b716bda419f61fa65..7ea217bc51f661a0c025ee6bdc148f2dddd4a6ad 100644 (file)
--- 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 b07429dfd566542cf52f44f79ae2272f4223f63f..941faca0814099669695aed82a8f32afb8b94f73 100644 (file)
--- 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 1d70cec92eeb9fffa7a8e7d1aa52159019627b03..60cbfca3de185aa3302f298152dff20c773e753a 100644 (file)
--- 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 6d8999b4ed8907997c4e458b178987e19f21cb4b..afd7c36d110270b8c287292fda594ba510bdf51b 100644 (file)
--- 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"