| Message ID | 20190327155252.761-1-pvorel@suse.cz |
|---|---|
| State | Accepted |
| Delegated to: | Petr Vorel |
| Headers | show |
| Series | [1/1] shell: Fix handling default parameters in tst_mkfs() | expand |
Hi! > fixes regression when testing df01.sh > > Dash does not like shifting more than possible: > /opt/ltp/testcases/bin/df01.sh: 291: shift: can't shift that many > > Fixes: 465faf47f ("shell: Use $TST_FS_TYPE and $TST_DEVICE in tst_mkfs()") > > Signed-off-by: Petr Vorel <pvorel@suse.cz> > --- > Hi, > > don't like checking $# twice, but don't see right now way to do it > simpler. We can do the same thing twice as well, which may be a bit more readable: [ $# -ge 1 ] && shift [ $# -ge 1 ] && shift
Hi Cyril, > We can do the same thing twice as well, which may be a bit more > readable: > [ $# -ge 1 ] && shift > [ $# -ge 1 ] && shift I'd prefer my way, as this looks like entered twice by accident. But you chose the variant :). Kind regards, Petr
Hi Cyril, > We can do the same thing twice as well, which may be a bit more > readable: > [ $# -ge 1 ] && shift > [ $# -ge 1 ] && shift Merged your variant. It's really more readable. Thanks! Kind regards, Petr
diff --git a/testcases/lib/tst_test.sh b/testcases/lib/tst_test.sh index af16ce1cf..d3905d378 100644 --- a/testcases/lib/tst_test.sh +++ b/testcases/lib/tst_test.sh @@ -288,7 +288,8 @@ tst_mkfs() { local fs_type=${1:-$TST_FS_TYPE} local device=${2:-$TST_DEVICE} - shift 2 + [ $# -eq 1 ] && shift 1 + [ $# -ge 2 ] && shift 2 local fs_opts="$@" if [ -z "$fs_type" ]; then
fixes regression when testing df01.sh Dash does not like shifting more than possible: /opt/ltp/testcases/bin/df01.sh: 291: shift: can't shift that many Fixes: 465faf47f ("shell: Use $TST_FS_TYPE and $TST_DEVICE in tst_mkfs()") Signed-off-by: Petr Vorel <pvorel@suse.cz> --- Hi, don't like checking $# twice, but don't see right now way to do it simpler. Sorry for introducing regression. Kind regards, Petr --- testcases/lib/tst_test.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)