diff options
Diffstat (limited to 'regressions')
-rwxr-xr-x | regressions/rhbz503169c10.sh | 7 | ||||
-rwxr-xr-x | regressions/rhbz503169c13.sh | 7 | ||||
-rwxr-xr-x | regressions/rhbz557655.sh | 8 | ||||
-rwxr-xr-x | regressions/rhbz576879.sh | 4 | ||||
-rwxr-xr-x | regressions/test-bootbootboot.sh | 2 | ||||
-rwxr-xr-x | regressions/test-cancellation-upload-daemoncancels.sh | 13 | ||||
-rwxr-xr-x | regressions/test-qemudie-killsub.sh | 9 | ||||
-rwxr-xr-x | regressions/test-qemudie-midcommand.sh | 9 | ||||
-rwxr-xr-x | regressions/test-qemudie-synch.sh | 9 |
9 files changed, 17 insertions, 51 deletions
diff --git a/regressions/rhbz503169c10.sh b/regressions/rhbz503169c10.sh index a975f692..a777b220 100755 --- a/regressions/rhbz503169c10.sh +++ b/regressions/rhbz503169c10.sh @@ -23,12 +23,7 @@ set -e rm -f test1.img -../fish/guestfish <<EOF -sparse test1.img 10M -launch -part-disk /dev/sda mbr -mkfs ext2 /dev/sda1 -mount-options "" /dev/sda1 / +../fish/guestfish -N fs -m /dev/sda1 <<EOF ll /../dev/console ll /../dev/full ll /../dev/mapper/ diff --git a/regressions/rhbz503169c13.sh b/regressions/rhbz503169c13.sh index 1b19cdf3..a1a84c62 100755 --- a/regressions/rhbz503169c13.sh +++ b/regressions/rhbz503169c13.sh @@ -28,12 +28,7 @@ set -e rm -f test1.img -../fish/guestfish <<EOF -sparse test1.img 10M -run -part-disk /dev/sda mbr -mkfs ext2 /dev/sda1 -mount-options "" /dev/sda1 / +../fish/guestfish -N fs -m /dev/sda1 <<EOF mkdir /dev -command /ignore-this-error unmount-all diff --git a/regressions/rhbz557655.sh b/regressions/rhbz557655.sh index 85cfb1e8..228b4983 100755 --- a/regressions/rhbz557655.sh +++ b/regressions/rhbz557655.sh @@ -49,13 +49,7 @@ get-memsize -set-memsize 123L EOF -../fish/guestfish >> test.out 2>> test.err <<EOF -alloc test1.img 10M -run -part-disk /dev/sda mbr -mkfs ext2 /dev/sda1 -mount /dev/sda1 / - +../fish/guestfish -N fs -m /dev/sda1 >> test.out 2>> test.err <<EOF touch /test # truncate-size takes an Int64 argument diff --git a/regressions/rhbz576879.sh b/regressions/rhbz576879.sh index 639dd7cf..7453ac78 100755 --- a/regressions/rhbz576879.sh +++ b/regressions/rhbz576879.sh @@ -24,9 +24,7 @@ set -e rm -f test1.img -../fish/guestfish <<EOF -alloc test1.img 10M -run +../fish/guestfish -N disk <<EOF -upload $srcdir/rhbz576879.sh /test.sh # Shouldn't lose synchronization, so next command should work: ping-daemon diff --git a/regressions/test-bootbootboot.sh b/regressions/test-bootbootboot.sh index 842e41fe..d3a30a34 100755 --- a/regressions/test-bootbootboot.sh +++ b/regressions/test-bootbootboot.sh @@ -32,7 +32,7 @@ export LIBGUESTFS_DEBUG=1 for i in $(seq 1 $n); do echo Test boot $i of $n ... - ../fish/guestfish sparse test1.img 500M : run + ../fish/guestfish -N disk </dev/null done rm test1.img diff --git a/regressions/test-cancellation-upload-daemoncancels.sh b/regressions/test-cancellation-upload-daemoncancels.sh index 4962c255..8204530b 100755 --- a/regressions/test-cancellation-upload-daemoncancels.sh +++ b/regressions/test-cancellation-upload-daemoncancels.sh @@ -22,16 +22,9 @@ set -e -rm -f test.img - -../fish/guestfish <<'EOF' -alloc test.img 10M -run - -part-disk /dev/sda mbr -mkfs ext2 /dev/sda1 -mount-options "" /dev/sda1 / +rm -f test1.img +../fish/guestfish -N fs -m /dev/sda1 <<'EOF' # Upload image, daemon should cancel because the image is too large # to upload into itself. echo "Expect: write: /test: No space left on device" @@ -40,4 +33,4 @@ echo "Expect: write: /test: No space left on device" ping-daemon EOF -rm -f test.img +rm -f test1.img diff --git a/regressions/test-qemudie-killsub.sh b/regressions/test-qemudie-killsub.sh index 14b46882..32809757 100755 --- a/regressions/test-qemudie-killsub.sh +++ b/regressions/test-qemudie-killsub.sh @@ -20,12 +20,9 @@ set -e -rm -f test.img - -../fish/guestfish <<'EOF' -alloc test.img 10M -run +rm -f test1.img +../fish/guestfish -N disk <<'EOF' # Kill the subprocess. kill-subprocess @@ -38,4 +35,4 @@ run ping-daemon EOF -rm -f test.img +rm -f test1.img diff --git a/regressions/test-qemudie-midcommand.sh b/regressions/test-qemudie-midcommand.sh index 92a4c688..84e19b0e 100755 --- a/regressions/test-qemudie-midcommand.sh +++ b/regressions/test-qemudie-midcommand.sh @@ -20,12 +20,9 @@ set -e -rm -f test.pid test.img - -../fish/guestfish <<'EOF' -alloc test.img 10M -run +rm -f test.pid test1.img +../fish/guestfish -N disk <<'EOF' # Kill the subprocess after a short wait. pid | cat > test.pid ! sleep 2 ; kill $(cat test.pid) & @@ -38,4 +35,4 @@ run ping-daemon EOF -rm -f test.pid test.img +rm -f test.pid test1.img diff --git a/regressions/test-qemudie-synch.sh b/regressions/test-qemudie-synch.sh index 5932fef2..85aef699 100755 --- a/regressions/test-qemudie-synch.sh +++ b/regressions/test-qemudie-synch.sh @@ -20,12 +20,9 @@ set -e -rm -f test.pid test.img - -../fish/guestfish <<'EOF' -alloc test.img 10M -run +rm -f test.pid test1.img +../fish/guestfish -N disk <<'EOF' # Kill subprocess. pid | cat > test.pid ! kill $(cat test.pid) ; sleep 2 @@ -39,4 +36,4 @@ run ping-daemon EOF -rm -f test.pid test.img +rm -f test.pid test1.img |