diff options
author | Ron Yorston <rmy@pobox.com> | 2015-01-23 09:50:40 +0000 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2015-01-23 09:50:40 +0000 |
commit | 63dbf1908bc51918d9d963f4d9b7657306b2970d (patch) | |
tree | 781ebfdcbbb953688e06f3541ce9e0c71f1dadfa /testsuite/find.tests | |
parent | 06900749637b925af1ebdf5030ba03a379f4f84f (diff) | |
parent | 6968e081230fb6434a2a6f0eed39d538ea982f3f (diff) | |
download | busybox-w32-TIG_1_23_0.tar.gz busybox-w32-TIG_1_23_0.tar.bz2 busybox-w32-TIG_1_23_0.zip |
Merge commit '1_23_0' into mergeTIG_1_23_0
Conflicts:
libbb/lineedit.c
Diffstat (limited to '')
-rwxr-xr-x | testsuite/find.tests | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/testsuite/find.tests b/testsuite/find.tests index f041106c3..78dfa1230 100755 --- a/testsuite/find.tests +++ b/testsuite/find.tests | |||
@@ -10,11 +10,12 @@ | |||
10 | mkdir -p find.tempdir | 10 | mkdir -p find.tempdir |
11 | touch find.tempdir/testfile | 11 | touch find.tempdir/testfile |
12 | 12 | ||
13 | optional FEATURE_FIND_TYPE | ||
13 | testing "find -type f" \ | 14 | testing "find -type f" \ |
14 | "cd find.tempdir && find -type f 2>&1" \ | 15 | "cd find.tempdir && find -type f 2>&1" \ |
15 | "./testfile\n" \ | 16 | "./testfile\n" \ |
16 | "" "" | 17 | "" "" |
17 | 18 | SKIP= | |
18 | optional FEATURE_FIND_EXEC | 19 | optional FEATURE_FIND_EXEC |
19 | testing "find -exec exitcode 1" \ | 20 | testing "find -exec exitcode 1" \ |
20 | "cd find.tempdir && find testfile -exec true {} \; 2>&1; echo \$?" \ | 21 | "cd find.tempdir && find testfile -exec true {} \; 2>&1; echo \$?" \ |