diff options
| author | Elliott Hughes <enh@google.com> | 2020-02-18 10:49:23 -0800 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2020-02-18 11:03:49 -0800 |
| commit | bd94be156cbebce0710efe26aa6a3ce38ed06b59 (patch) | |
| tree | 0dbcb767ec801e2bbaff5d94bc4db41101408592 | |
| parent | d8dd46c6a43f583d879beae4a4bb513327d25063 (diff) | |
| download | toybox-bd94be156cbebce0710efe26aa6a3ce38ed06b59.tar.gz | |
Enable test(1) for device and host.
Test: treehugger
Change-Id: I83bea17f43580e5d063339b51bbd708de980e37f
| -rw-r--r-- | .config-device | 2 | ||||
| -rw-r--r-- | .config-linux | 2 | ||||
| -rw-r--r-- | .config-mac | 2 | ||||
| -rw-r--r-- | Android.bp | 2 | ||||
| -rw-r--r-- | android/device/generated/config.h | 4 | ||||
| -rw-r--r-- | android/linux/generated/config.h | 4 | ||||
| -rw-r--r-- | android/mac/generated/config.h | 4 |
7 files changed, 11 insertions, 9 deletions
diff --git a/.config-device b/.config-device index a3a3a0be..883ea020 100644 --- a/.config-device +++ b/.config-device @@ -304,7 +304,7 @@ CONFIG_TASKSET=y CONFIG_TEE=y # CONFIG_TELNETD is not set # CONFIG_TELNET is not set -# CONFIG_TEST is not set +CONFIG_TEST=y # CONFIG_TFTPD is not set # CONFIG_TFTP is not set CONFIG_TIMEOUT=y diff --git a/.config-linux b/.config-linux index 0dfb2558..339a99d6 100644 --- a/.config-linux +++ b/.config-linux @@ -294,7 +294,7 @@ CONFIG_TAR=y CONFIG_TEE=y # CONFIG_TELNETD is not set # CONFIG_TELNET is not set -# CONFIG_TEST is not set +CONFIG_TEST=y # CONFIG_TFTPD is not set # CONFIG_TFTP is not set # CONFIG_TIME is not set diff --git a/.config-mac b/.config-mac index 4e0e8a65..bf601ada 100644 --- a/.config-mac +++ b/.config-mac @@ -294,7 +294,7 @@ CONFIG_TAR=y CONFIG_TEE=y # CONFIG_TELNETD is not set # CONFIG_TELNET is not set -# CONFIG_TEST is not set +CONFIG_TEST=y # CONFIG_TFTPD is not set # CONFIG_TFTP is not set # CONFIG_TIME is not set @@ -120,6 +120,7 @@ cc_defaults { "toys/posix/tail.c", "toys/posix/tar.c", "toys/posix/tee.c", + "toys/posix/test.c", "toys/posix/touch.c", "toys/posix/true.c", "toys/posix/uname.c", @@ -440,6 +441,7 @@ cc_defaults { "tar", "taskset", "tee", + "test", "time", "timeout", "top", diff --git a/android/device/generated/config.h b/android/device/generated/config.h index b6419249..4c0fc103 100644 --- a/android/device/generated/config.h +++ b/android/device/generated/config.h @@ -582,8 +582,8 @@ #define USE_TELNETD(...) #define CFG_TELNET 0 #define USE_TELNET(...) -#define CFG_TEST 0 -#define USE_TEST(...) +#define CFG_TEST 1 +#define USE_TEST(...) __VA_ARGS__ #define CFG_TFTPD 0 #define USE_TFTPD(...) #define CFG_TFTP 0 diff --git a/android/linux/generated/config.h b/android/linux/generated/config.h index 965679f9..0e65aaea 100644 --- a/android/linux/generated/config.h +++ b/android/linux/generated/config.h @@ -562,8 +562,8 @@ #define USE_TELNETD(...) #define CFG_TELNET 0 #define USE_TELNET(...) -#define CFG_TEST 0 -#define USE_TEST(...) +#define CFG_TEST 1 +#define USE_TEST(...) __VA_ARGS__ #define CFG_TFTPD 0 #define USE_TFTPD(...) #define CFG_TFTP 0 diff --git a/android/mac/generated/config.h b/android/mac/generated/config.h index dbe23c6a..0a08be9c 100644 --- a/android/mac/generated/config.h +++ b/android/mac/generated/config.h @@ -562,8 +562,8 @@ #define USE_TELNETD(...) #define CFG_TELNET 0 #define USE_TELNET(...) -#define CFG_TEST 0 -#define USE_TEST(...) +#define CFG_TEST 1 +#define USE_TEST(...) __VA_ARGS__ #define CFG_TFTPD 0 #define USE_TFTPD(...) #define CFG_TFTP 0 |