diff options
| author | Ron Yorston <rmy@pobox.com> | 2014-03-11 19:40:20 +0000 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2014-03-11 19:40:20 +0000 |
| commit | dec20ad781163656832c571d52d0303c67ea8c09 (patch) | |
| tree | 830a27bc8f2383d4ba50680f5d6fac1ec5c96b6a /testsuite | |
| parent | 0a2a7b55a9212d8fc708fd564407e5505b5e8363 (diff) | |
| parent | 69f9567de28976cfbc7b216c46aa391ce82bd3b7 (diff) | |
| download | busybox-w32-dec20ad781163656832c571d52d0303c67ea8c09.tar.gz busybox-w32-dec20ad781163656832c571d52d0303c67ea8c09.tar.bz2 busybox-w32-dec20ad781163656832c571d52d0303c67ea8c09.zip | |
Merge branch 'busybox' into merge
Diffstat (limited to 'testsuite')
| -rwxr-xr-x | testsuite/grep.tests | 12 | ||||
| -rw-r--r-- | testsuite/which/which-uses-default-path | 2 |
2 files changed, 13 insertions, 1 deletions
diff --git a/testsuite/grep.tests b/testsuite/grep.tests index 412efffbb..323b3849d 100755 --- a/testsuite/grep.tests +++ b/testsuite/grep.tests | |||
| @@ -159,6 +159,18 @@ testing "grep -w ^ doesn't hang" \ | |||
| 159 | "anything\n" \ | 159 | "anything\n" \ |
| 160 | "" | 160 | "" |
| 161 | 161 | ||
| 162 | testing "grep -w word doesn't match wordword" \ | ||
| 163 | "grep -w word input" \ | ||
| 164 | "" \ | ||
| 165 | "wordword\n" \ | ||
| 166 | "" | ||
| 167 | |||
| 168 | testing "grep -w word match second word" \ | ||
| 169 | "grep -w word input" \ | ||
| 170 | "bword,word\n""wordb,word\n""bwordb,word\n" \ | ||
| 171 | "bword,word\n""wordb,word\n""bwordb,word\n" \ | ||
| 172 | "" | ||
| 173 | |||
| 162 | # testing "test name" "commands" "expected result" "file input" "stdin" | 174 | # testing "test name" "commands" "expected result" "file input" "stdin" |
| 163 | # file input will be file called "input" | 175 | # file input will be file called "input" |
| 164 | # test can create a file "actual" instead of writing to stdout | 176 | # test can create a file "actual" instead of writing to stdout |
diff --git a/testsuite/which/which-uses-default-path b/testsuite/which/which-uses-default-path index 349583dcc..92b6018c9 100644 --- a/testsuite/which/which-uses-default-path +++ b/testsuite/which/which-uses-default-path | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | BUSYBOX=$(command -pv busybox) | 1 | BUSYBOX=$(command -v busybox) |
| 2 | SAVED_PATH=$PATH | 2 | SAVED_PATH=$PATH |
| 3 | unset PATH | 3 | unset PATH |
| 4 | $BUSYBOX which ls | 4 | $BUSYBOX which ls |