QEMU-Devel Archive on lore.kernel.org
 help / color / Atom feed
From: Max Reitz <mreitz@redhat.com>
To: qemu-block@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>, Thomas Huth <thuth@redhat.com>,
	qemu-devel@nongnu.org, Max Reitz <mreitz@redhat.com>
Subject: [PATCH 01/23] iotests: Introduce $SOCK_DIR
Date: Thu, 10 Oct 2019 17:24:35 +0200
Message-ID: <20191010152457.17713-2-mreitz@redhat.com> (raw)
In-Reply-To: <20191010152457.17713-1-mreitz@redhat.com>

Unix sockets generally have a maximum path length.  Depending on your
$TEST_DIR, it may be exceeded and then all tests that create and use
Unix sockets there may fail.

Circumvent this by adding a new scratch directory specifically for
Unix socket files.  It defaults to a temporary directory (mktemp -d)
that is completely removed after the iotests are done.

(By default, mktemp -d creates a /tmp/tmp.XXXXXXXXXX directory, which
should be short enough for our use cases.)

Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 tests/qemu-iotests/check | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check
index 588c453a94..a257215448 100755
--- a/tests/qemu-iotests/check
+++ b/tests/qemu-iotests/check
@@ -97,6 +97,7 @@ IMGFMT        -- $FULL_IMGFMT_DETAILS
 IMGPROTO      -- $IMGPROTO
 PLATFORM      -- $FULL_HOST_DETAILS
 TEST_DIR      -- $TEST_DIR
+SOCK_DIR      -- $SOCK_DIR
 SOCKET_SCM_HELPER -- $SOCKET_SCM_HELPER
 
 EOF
@@ -121,6 +122,16 @@ if [ ! -e "$TEST_DIR" ]; then
         mkdir "$TEST_DIR"
 fi
 
+tmp_sock_dir=false
+if [ -z "$SOCK_DIR" ]; then
+    SOCK_DIR=$(mktemp -d)
+    tmp_sock_dir=true
+fi
+
+if [ ! -d "$SOCK_DIR" ]; then
+    mkdir "$SOCK_DIR"
+fi
+
 diff="diff -u"
 verbose=false
 debug=false
@@ -534,6 +545,7 @@ if [ -z "$SAMPLE_IMG_DIR" ]; then
 fi
 
 export TEST_DIR
+export SOCK_DIR
 export SAMPLE_IMG_DIR
 
 if [ -s $tmp.list ]
@@ -716,6 +728,11 @@ END        { if (NR > 0) {
     rm -f "${TEST_DIR}"/*.out "${TEST_DIR}"/*.err "${TEST_DIR}"/*.time
     rm -f "${TEST_DIR}"/check.pid "${TEST_DIR}"/check.sts
     rm -f $tmp.*
+
+    if $tmp_sock_dir
+    then
+        rm -rf "$SOCK_DIR"
+    fi
 }
 
 trap "_wrapup; exit \$status" 0 1 2 3 15
-- 
2.21.0



  reply index

Thread overview: 66+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-10-10 15:24 [PATCH 00/23] iotests: Add and use $SOCK_DIR Max Reitz
2019-10-10 15:24 ` Max Reitz [this message]
2019-10-10 18:18   ` [PATCH 01/23] iotests: Introduce $SOCK_DIR Eric Blake
2019-10-11  7:51     ` Max Reitz
2019-10-10 15:24 ` [PATCH 02/23] iotests.py: Store socket files in $SOCK_DIR Max Reitz
2019-10-10 18:36   ` Eric Blake
2019-10-11  7:21   ` Thomas Huth
2019-10-10 15:24 ` [PATCH 03/23] iotests.py: Add @base_dir to FilePaths etc Max Reitz
2019-10-10 18:40   ` Eric Blake
2019-10-10 15:24 ` [PATCH 04/23] iotests: Filter $SOCK_DIR Max Reitz
2019-10-10 18:42   ` Eric Blake
2019-10-11  7:54     ` Max Reitz
2019-10-11  7:57       ` Thomas Huth
2019-10-10 19:50   ` Eric Blake
2019-10-11  7:57     ` Max Reitz
2019-10-10 15:24 ` [PATCH 05/23] iotests: Let common.nbd create socket in $SOCK_DIR Max Reitz
2019-10-10 18:59   ` Eric Blake
2019-10-10 15:24 ` [PATCH 06/23] iotests/083: Create " Max Reitz
2019-10-10 19:03   ` Eric Blake
2019-10-11  7:31   ` Thomas Huth
2019-10-10 15:24 ` [PATCH 07/23] iotests/140: " Max Reitz
2019-10-10 19:05   ` Eric Blake
2019-10-11  7:34   ` Thomas Huth
2019-10-10 15:24 ` [PATCH 08/23] iotests/143: " Max Reitz
2019-10-10 19:23   ` Eric Blake
2019-10-11  7:35   ` Thomas Huth
2019-10-10 15:24 ` [PATCH 09/23] iotests/147: " Max Reitz
2019-10-10 19:23   ` Eric Blake
2019-10-11  7:36   ` Thomas Huth
2019-10-10 15:24 ` [PATCH 10/23] iotests/181: " Max Reitz
2019-10-10 19:24   ` Eric Blake
2019-10-11  7:38   ` Thomas Huth
2019-10-10 15:24 ` [PATCH 11/23] iotests/182: " Max Reitz
2019-10-10 19:24   ` Eric Blake
2019-10-11  7:38   ` Thomas Huth
2019-10-10 15:24 ` [PATCH 12/23] iotests/183: " Max Reitz
2019-10-10 19:28   ` Eric Blake
2019-10-11  7:42   ` Thomas Huth
2019-10-10 15:24 ` [PATCH 13/23] iotests/192: " Max Reitz
2019-10-10 19:28   ` Eric Blake
2019-10-10 15:24 ` [PATCH 14/23] iotests/194: Create sockets " Max Reitz
2019-10-10 19:32   ` Eric Blake
2019-10-10 19:43   ` Eric Blake
2019-10-11  7:55     ` Max Reitz
2019-10-10 15:24 ` [PATCH 15/23] iotests/201: Create socket " Max Reitz
2019-10-10 19:39   ` Eric Blake
2019-10-10 15:24 ` [PATCH 16/23] iotests/205: " Max Reitz
2019-10-10 19:40   ` Eric Blake
2019-10-10 15:24 ` [PATCH 17/23] iotests/208: " Max Reitz
2019-10-10 19:41   ` Eric Blake
2019-10-10 15:24 ` [PATCH 18/23] iotests/209: " Max Reitz
2019-10-10 19:44   ` Eric Blake
2019-10-10 15:24 ` [PATCH 19/23] iotests/222: " Max Reitz
2019-10-10 19:45   ` Eric Blake
2019-10-10 15:24 ` [PATCH 20/23] iotests/223: " Max Reitz
2019-10-10 19:46   ` Eric Blake
2019-10-10 15:24 ` [PATCH 21/23] iotests/240: " Max Reitz
2019-10-10 19:46   ` Eric Blake
2019-10-10 15:24 ` [PATCH 22/23] iotests/267: " Max Reitz
2019-10-10 19:47   ` Eric Blake
2019-10-10 15:24 ` [PATCH 23/23] iotests: Drop TEST_DIR filter from _filter_nbd Max Reitz
2019-10-10 19:51   ` Eric Blake
2019-10-11  7:27 ` [PATCH 00/23] iotests: Add and use $SOCK_DIR Thomas Huth
2019-10-11  8:03   ` Max Reitz
2019-10-11  8:13     ` Thomas Huth
2019-10-11  8:54   ` Max Reitz

Reply instructions:

You may reply publically to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20191010152457.17713-2-mreitz@redhat.com \
    --to=mreitz@redhat.com \
    --cc=kwolf@redhat.com \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=thuth@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

QEMU-Devel Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/qemu-devel/0 qemu-devel/git/0.git
	git clone --mirror https://lore.kernel.org/qemu-devel/1 qemu-devel/git/1.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 qemu-devel qemu-devel/ https://lore.kernel.org/qemu-devel \
		qemu-devel@nongnu.org
	public-inbox-index qemu-devel

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.nongnu.qemu-devel


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git