58 lines
1.5 KiB
Diff
58 lines
1.5 KiB
Diff
From 974f6aba15d71984b5f05dc8b5f10bb7a5cec082 Mon Sep 17 00:00:00 2001
|
|
From: "Richard W.M. Jones" <rjones@redhat.com>
|
|
Date: Wed, 6 Jun 2018 19:29:35 +0100
|
|
Subject: [PATCH 1/2] tests: Provide full path to Unix domain sockets.
|
|
|
|
See also this thread:
|
|
https://www.redhat.com/archives/libvir-list/2018-June/msg00490.html
|
|
---
|
|
tests/test-cache.sh | 3 ++-
|
|
tests/test-cow.sh | 3 ++-
|
|
2 files changed, 4 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/tests/test-cache.sh b/tests/test-cache.sh
|
|
index e5e9e82..c46e7be 100755
|
|
--- a/tests/test-cache.sh
|
|
+++ b/tests/test-cache.sh
|
|
@@ -32,6 +32,7 @@
|
|
# SUCH DAMAGE.
|
|
|
|
set -e
|
|
+set -x
|
|
|
|
files="cache.img cache.sock cache.pid"
|
|
rm -f $files
|
|
@@ -69,7 +70,7 @@ cleanup ()
|
|
trap cleanup INT QUIT TERM EXIT ERR
|
|
|
|
# Open the overlay and perform some operations.
|
|
-guestfish --format=raw -a 'nbd://?socket=cache.sock' <<'EOF'
|
|
+guestfish --format=raw -a "nbd://?socket=$PWD/cache.sock" <<'EOF'
|
|
run
|
|
part-disk /dev/sda gpt
|
|
mkfs ext4 /dev/sda1
|
|
diff --git a/tests/test-cow.sh b/tests/test-cow.sh
|
|
index 443ba38..01d2d04 100755
|
|
--- a/tests/test-cow.sh
|
|
+++ b/tests/test-cow.sh
|
|
@@ -32,6 +32,7 @@
|
|
# SUCH DAMAGE.
|
|
|
|
set -e
|
|
+set -x
|
|
|
|
files="cow-base.img cow-diff.qcow2 cow.sock cow.pid"
|
|
rm -f $files
|
|
@@ -70,7 +71,7 @@ cleanup ()
|
|
trap cleanup INT QUIT TERM EXIT ERR
|
|
|
|
# Write some data into the overlay.
|
|
-guestfish --format=raw -a 'nbd://?socket=cow.sock' -m /dev/sda1 <<EOF
|
|
+guestfish --format=raw -a "nbd://?socket=$PWD/cow.sock" -m /dev/sda1 <<EOF
|
|
fill-dir / 10000
|
|
fill-pattern "abcde" 5M /large
|
|
write /hello "hello, world"
|
|
--
|
|
2.16.2
|
|
|