tests: Change more conflicting temporary output file names.

Various tests cannot be run in parallel just because they happen to
use conflicting names for temporary output files (eg. "test.out").

Change these tests to use unique temporary names, so the tests could
be run in parallel.

.gitignore

@@ -462,8 +462,6 @@ Makefile.in
 /sysprep/sysprep-operations.pod
 /sysprep/virt-sysprep
 /sysprep/virt-sysprep.1
-/test.err
-/test.out
 /tests/c-api/test-add-drive-opts
 /tests/c-api/test-add-libvirt-dom
 /tests/c-api/test-backend-settings

builder/test-virt-builder.sh

@@ -74,7 +74,7 @@ $VG virt-builder phony-fedora \
     --firstboot-install "minicom,inkscape"
 
 # Check that some modifications were made.
-$VG guestfish --ro -i -a $output > test.out <<EOF
+$VG guestfish --ro -i -a $output > test-virt-builder.out <<EOF
 # Uploaded files
 is-file /etc/foo/bar/baz/Makefile
 cat /etc/foo/bar/baz/foo
@@ -99,7 +99,7 @@ is-file /etc/shadow
 cat /etc/shadow | sed -r '/^root:/!d;s,^(root:\\\$6\\\$).*,\\1,g'
 EOF
 
-if [ "$(cat test.out)" != "true
+if [ "$(cat test-virt-builder.out)" != "true
 Hello World
 true
 true
@@ -115,9 +115,9 @@ true
 true
 root:\$6\$" ]; then
     echo "$0: unexpected output:"
-    cat test.out
+    cat test-virt-builder.out
     exit 1
 fi
 
 rm $output
-rm test.out
+rm test-virt-builder.out

fish/test-events.sh

@@ -20,9 +20,9 @@
 
 set -e
 
-rm -f test.out
+rm -f test-events.out
 
-$VG guestfish -a /dev/null <<'EOF' | grep -v get_verbose | grep -v get_trace | grep -v 'library .*0x' | grep -v 'library command' | grep -v 'get_path' > test.out
+$VG guestfish -a /dev/null <<'EOF' | grep -v get_verbose | grep -v get_trace | grep -v 'library .*0x' | grep -v 'library command' | grep -v 'get_path' > test-events.out
 trace true
 
 event ev1 * "echo $EVENT $@"
@@ -49,7 +49,7 @@ list-events
 
 EOF
 
-if [ "$(cat test.out)" != '"ev1" (0): *: echo $EVENT $@
+if [ "$(cat test-events.out)" != '"ev1" (0): *: echo $EVENT $@
 "ev1" (1): *: echo $EVENT $@
 "ev2" (2): *: echo $EVENT $@
 "ev2" (2): *: echo $EVENT $@
@@ -75,8 +75,8 @@ close
 "ev2" (1): close,subprocess_quit: echo $EVENT $@
 close' ]; then
     echo "$0: unexpected output from guestfish events"
-    cat test.out
+    cat test-events.out
     exit 1
 fi
 
-rm test.out
+rm test-events.out

fish/test-file-attrs.sh

@@ -21,9 +21,9 @@
 set -e
 export LANG=C
 
-rm -f test.out
+rm -f test-file-attrs.out
 
-$VG guestfish > test.out <<EOF
+$VG guestfish > test-file-attrs.out <<EOF
 scratch 50MB
 run
 part-disk /dev/sda mbr
@@ -72,7 +72,7 @@ copy-attributes /foo /new mode:true
 stat /new | grep mode:
 EOF
 
-if [ "$(cat test.out)" != "mode: 33226
+if [ "$(cat test-file-attrs.out)" != "mode: 33226
 mode: 33226
 -----
 uid: 0
@@ -150,8 +150,8 @@ gid: 11
 }
 mode: 33226" ]; then
     echo "$0: unexpected output:"
-    cat test.out
+    cat test-file-attrs.out
     exit 1
 fi
 
-rm test.out
+rm test-file-attrs.out

fish/test-find0.sh

@@ -20,20 +20,20 @@
 
 set -e
 
-rm -f test.out
+rm -f test-find0.out
 
 $VG guestfish <<'EOF'
 add-ro ../test-data/test.iso
 run
 mount-ro /dev/sda /
-find0 / test.out
+find0 / test-find0.out
 EOF
 
-n=$(tr '\0' '\n' < test.out | grep '^known-[1-5]' | wc -l)
+n=$(tr '\0' '\n' < test-find0.out | grep '^known-[1-5]' | wc -l)
 [ "$n" = 5 ] || {
   echo find0: Invalid list of files
-  tr '\0' '\n' < test.out
+  tr '\0' '\n' < test-find0.out
   exit 1
 }
 
-rm -f test.out
+rm -f test-find0.out

fish/test-read-file.sh

@@ -20,15 +20,15 @@
 
 set -e
 
-rm -f test.out
+rm -f test-read-file.out
 
-$VG guestfish <<'EOF' > test.out
+$VG guestfish <<'EOF' > test-read-file.out
 add-ro ../test-data/test.iso
 run
 mount-ro /dev/sda /
 read-file /helloworld.tar
 EOF
 
-cmp $srcdir/../test-data/files/helloworld.tar test.out
+cmp $srcdir/../test-data/files/helloworld.tar test-read-file.out
 
-rm -f test.out
+rm -f test-read-file.out

tests/btrfs/test-btrfs-replace.sh

@@ -32,12 +32,12 @@ if ! guestfish -a /dev/null run : available btrfs; then
     exit 77
 fi
 
-rm -f test-btrfs-devices-{1,2}.img replace.output
+rm -f test-btrfs-replace-{1,2}.img replace.output
 
 guestfish  <<EOF > replace.output
 # Add 2 empty disks
-sparse test-btrfs-devices-1.img 1G
-sparse test-btrfs-devices-2.img 1G
+sparse test-btrfs-replace-1.img 1G
+sparse test-btrfs-replace-2.img 1G
 run
 
 mkfs-btrfs /dev/sda
@@ -63,4 +63,4 @@ filesanddirs-10M.tar.xz" ]; then
     exit 1
 fi
 
-rm test-btrfs-devices-{1,2}.img replace.output
+rm test-btrfs-replace-{1,2}.img replace.output

tests/regressions/rhbz563450.sh

@@ -27,9 +27,9 @@ if [ ! -s ../../test-data/phony-guests/fedora.img -o ! -s ../../test-data/test.i
     exit 77
 fi
 
-rm -f test.out
+rm -f rhbz563450.out
 
-guestfish --ro > test.out <<EOF
+guestfish --ro > rhbz563450.out <<EOF
 add-drive-ro ../../test-data/phony-guests/fedora.img
 add-cdrom ../../test-data/test.iso
 add-drive-ro ../../test-data/phony-guests/debian.img
@@ -43,7 +43,7 @@ list-partitions | sed -r 's,^/dev/[abce-ln-z]+d,/dev/sd,'
 ping-daemon
 EOF
 
-if [ "$(cat test.out)" != "/dev/sda
+if [ "$(cat rhbz563450.out)" != "/dev/sda
 /dev/sdb
 /dev/sdc
 ----
@@ -52,8 +52,8 @@ if [ "$(cat test.out)" != "/dev/sda
 /dev/sdc1
 /dev/sdc2" ]; then
     echo "$0: unexpected output:"
-    cat test.out
+    cat rhbz563450.out
     exit 1
 fi
 
-rm -f test.out
+rm -f rhbz563450.out

tests/regressions/rhbz563450b.sh

@@ -27,9 +27,9 @@ if [ ! -s ../../test-data/test.iso ]; then
     exit 77
 fi
 
-rm -f test.out
+rm -f rhbz563450b.out
 
-guestfish --ro > test.out <<EOF
+guestfish --ro > rhbz563450b.out <<EOF
 add-cdrom ../../test-data/test.iso
 
 run
@@ -39,10 +39,10 @@ list-devices | sed -r 's,^/dev/[abce-ln-z]+d,/dev/sd,'
 ping-daemon
 EOF
 
-if [ "$(cat test.out)" != "/dev/sda" ]; then
+if [ "$(cat rhbz563450b.out)" != "/dev/sda" ]; then
     echo "$0: unexpected output:"
-    cat test.out
+    cat rhbz563450b.out
     exit 1
 fi
 
-rm -f test.out
+rm -f rhbz563450b.out

tests/regressions/rhbz789960.sh

@@ -22,9 +22,9 @@
 set -e
 export LANG=C
 
-rm -f test.out
+rm -f rhbz789960.out
 
-guestfish -a ../../test-data/phony-guests/fedora.img --ro > test.out <<EOF
+guestfish -a ../../test-data/phony-guests/fedora.img --ro > rhbz789960.out <<EOF
 run
 
 # Not a device at all, should fail.
@@ -59,10 +59,10 @@ echo done
 
 EOF
 
-if [ "$(cat test.out)" != "done" ]; then
+if [ "$(cat rhbz789960.out)" != "done" ]; then
     echo "$0: unexpected output:"
-    cat test.out
+    cat rhbz789960.out
     exit 1
 fi
 
-rm -f test.out
+rm -f rhbz789960.out

v2v/test-v2v-oa-option.sh

@@ -43,7 +43,7 @@ fi
 
 export VIRT_TOOLS_DATA_DIR="$PWD/fake-virt-tools"
 
-d=test-v2v-windows-conversion.d
+d=test-v2v-oa-option.d
 rm -rf $d
 mkdir $d
 

v2v/test-v2v-of-option.sh

@@ -43,7 +43,7 @@ fi
 
 export VIRT_TOOLS_DATA_DIR="$PWD/fake-virt-tools"
 
-d=test-v2v-windows-conversion.d
+d=test-v2v-of-option.d
 rm -rf $d
 mkdir $d
 

v2v/test-v2v-on-option.sh

@@ -43,7 +43,7 @@ fi
 
 export VIRT_TOOLS_DATA_DIR="$PWD/fake-virt-tools"
 
-d=test-v2v-windows-conversion.d
+d=test-v2v-on-option.d
 rm -rf $d
 mkdir $d