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/mdev.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/mdev.tests | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/testsuite/mdev.tests b/testsuite/mdev.tests index 48d3dcc2c..59873011a 100755 --- a/testsuite/mdev.tests +++ b/testsuite/mdev.tests | |||
| @@ -168,7 +168,7 @@ SKIP= | |||
| 168 | # continuing to use directory structure from prev test | 168 | # continuing to use directory structure from prev test |
| 169 | rm -rf mdev.testdir/dev/* | 169 | rm -rf mdev.testdir/dev/* |
| 170 | echo "sda 0:0 644 @echo @echo TEST" >mdev.testdir/etc/mdev.conf | 170 | echo "sda 0:0 644 @echo @echo TEST" >mdev.testdir/etc/mdev.conf |
| 171 | optional STATIC FEATURE_MDEV_CONF FEATURE_MDEV_EXEC FEATURE_LS_RECURSIVE FEATURE_LS_TIMESTAMPS FEATURE_LS_USERNAME FEATURE_SH_IS_ASH | 171 | optional STATIC FEATURE_MDEV_CONF FEATURE_MDEV_EXEC FEATURE_LS_RECURSIVE FEATURE_LS_TIMESTAMPS FEATURE_LS_USERNAME FEATURE_SH_IS_ASH ASH_BUILTIN_ECHO |
| 172 | testing "mdev command" \ | 172 | testing "mdev command" \ |
| 173 | "env - PATH=$PATH ACTION=add DEVPATH=/block/sda chroot mdev.testdir /mdev 2>&1; | 173 | "env - PATH=$PATH ACTION=add DEVPATH=/block/sda chroot mdev.testdir /mdev 2>&1; |
| 174 | ls -lnR mdev.testdir/dev | $FILTER_LS" \ | 174 | ls -lnR mdev.testdir/dev | $FILTER_LS" \ |