From 98ab261a050c29beb3ae0d4925d72f437d2417c2 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Fri, 2 Dec 2022 11:35:57 +0000
Subject: [PATCH] tests/nbd: Move temporary files into tests/nbd/ subdirectory

This test fails for reasons I have not fully understood yet.  However
one thing I noticed is that the Unix domain socket and PID file used
the tests are placed in the tests/ directory, not the tests/nbd/
subdirectory, so let's fix that:

Starting qemu-nbd fedora-nbd.img -t --pid-file /home/rjones/d/libguestfs-rhel-9.2/tests/nbd.pid --format raw -p 63668 ...
Starting qemu-nbd fedora-nbd.img -t --pid-file /home/rjones/d/libguestfs-rhel-9.2/tests/nbd.pid --format raw -p 60684 ...
Starting qemu-nbd fedora-nbd.img -t --pid-file /home/rjones/d/libguestfs-rhel-9.2/tests/nbd.pid --format raw -k /home/rjones/d/libguestfs-rhel-9.2/tests/unix.sock ...

Fixes: commit 6d32773e811882f78dbd8c2a39a2b7a9c3cfca7c
---
 tests/nbd/test-nbd.pl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/nbd/test-nbd.pl b/tests/nbd/test-nbd.pl
index ef10df7bc..4a6b0ec66 100755
--- a/tests/nbd/test-nbd.pl
+++ b/tests/nbd/test-nbd.pl
@@ -51,7 +51,7 @@ sub run_test {
 
     my $cwd = getcwd ();
     my $server;
-    my $pidfile = "$cwd/nbd.pid";
+    my $pidfile = "$cwd/nbd/nbd.pid";
     my @qemu_nbd = ("qemu-nbd", $disk, "-t", "--pid-file", $pidfile);
     if ($has_format_opt) {
         push @qemu_nbd, "--format", "raw";
@@ -64,7 +64,7 @@ sub run_test {
     }
     else {
         # qemu-nbd insists the socket path is absolute.
-        my $socket = "$cwd/unix.sock";
+        my $socket = "$cwd/nbd/unix.sock";
         unlink "$socket";
         push @qemu_nbd, "-k", "$socket";
         $server = "unix:$socket";