shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00
Code Releases Activity

tests: aux.sh some backward compatible updates

Browse Source 
Older bash does not take empty array as bounded variable
(except for $@)
This commit is contained in:
Zdenek Kabelac 2017-07-17 15:01:44 +02:00
parent 3c32883cec
commit 5a5553bcec
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
test/lib/aux.sh
View File

@ -526,6 +526,8 @@ kill_tagged_processes() {
pids+=( "$pid" ) pids+=( "$pid" )
done < <(print_procs_by_tag_ "$@") done < <(print_procs_by_tag_ "$@")
test ${#pids[@]} -eq 0 && return
# wait if process exited and eventually -KILL # wait if process exited and eventually -KILL
wait=0 wait=0
for pid in "${pids[@]}" ; do for pid in "${pids[@]}" ; do
@ -619,7 +621,7 @@ teardown() {
prepare_loop() { prepare_loop() {
local size=${1=32} local size=${1=32}
local losetup_params=( ${@:2} ) shift # all other params are directly passed to all 'losetup' calls
local i local i
local slash local slash
@ -644,9 +646,9 @@ prepare_loop() {
local LOOPFILE="$PWD/test.img" local LOOPFILE="$PWD/test.img"
rm -f "$LOOPFILE" rm -f "$LOOPFILE"
dd if=/dev/zero of="$LOOPFILE" bs=$((1024*1024)) count=0 seek=$(( size + 1 )) 2> /dev/null dd if=/dev/zero of="$LOOPFILE" bs=$((1024*1024)) count=0 seek=$(( size + 1 )) 2> /dev/null
if LOOP=$(losetup "${losetup_params[@]}" -s -f "$LOOPFILE" 2>/dev/null); then if LOOP=$(losetup "$@" -s -f "$LOOPFILE" 2>/dev/null); then
: :
elif LOOP=$(losetup -f) && losetup "${losetup_params[@]}" "$LOOP" "$LOOPFILE"; then elif LOOP=$(losetup -f) && losetup "$@" "$LOOP" "$LOOPFILE"; then
# no -s support # no -s support
: :
else else
@ -657,7 +659,7 @@ prepare_loop() {
local dev="$DM_DEV_DIR/loop$slash$i" local dev="$DM_DEV_DIR/loop$slash$i"
! losetup "$dev" >/dev/null 2>&1 || continue ! losetup "$dev" >/dev/null 2>&1 || continue
# got a free # got a free
losetup "${losetup_params[@]}" "$dev" "$LOOPFILE" losetup "$@" "$dev" "$LOOPFILE"
LOOP=$dev LOOP=$dev
break break
done done
@ -1215,7 +1217,7 @@ EOF
echo "$s {" echo "$s {"
local k local k
for k in $(grep ^"$s"/ "$config_values" | cut -f1 -d= | sed -e 's, *$,,' | sort | uniq); do for k in $(grep ^"$s"/ "$config_values" | cut -f1 -d= | sed -e 's, *$,,' | sort | uniq); do
grep "^$k" "$config_values" | tail -n 1 | sed -e "s,^$s/, ," grep "^$k" "$config_values" | tail -n 1 | sed -e "s,^$s/, ," || true
done done
echo "}" echo "}"
echo echo