From patchwork Thu Oct 17 13:31:32 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Max Reitz X-Patchwork-Id: 11196225 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id EE2F514ED for ; Thu, 17 Oct 2019 14:29:01 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id CE88720820 for ; Thu, 17 Oct 2019 14:29:01 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CE88720820 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:49304 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iL6lw-0003Yu-UR for patchwork-qemu-devel@patchwork.kernel.org; Thu, 17 Oct 2019 10:29:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36602) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iL5ss-00024D-TM for qemu-devel@nongnu.org; Thu, 17 Oct 2019 09:32:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iL5sr-0003G8-FS for qemu-devel@nongnu.org; Thu, 17 Oct 2019 09:32:06 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44250) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iL5sk-0003EG-HK; Thu, 17 Oct 2019 09:31:58 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id AF7B518C4287; Thu, 17 Oct 2019 13:31:57 +0000 (UTC) Received: from localhost (ovpn-117-3.ams2.redhat.com [10.36.117.3]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2A73519C70; Thu, 17 Oct 2019 13:31:56 +0000 (UTC) From: Max Reitz To: qemu-block@nongnu.org Subject: [PATCH v2 00/23] iotests: Add and use $SOCK_DIR Date: Thu, 17 Oct 2019 15:31:32 +0200 Message-Id: <20191017133155.5327-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.62]); Thu, 17 Oct 2019 13:31:57 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , qemu-devel@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" Hi, Perhaps the main reason we cannot run important tests such as 041 in CI is that when they care Unix sockets in $TEST_DIR, the path may become too long to connect to them. To get by this problem, this series lets the check script create a new temporary directory (mktemp -d) and then makes the iotests use it for all Unix sockets. v2: - Patch 1: Use mkdir -p - Patches 4/23: Only add the $SOCK_DIR replacement line in patch 4 and only drop the $TEST_DIR line in patch 23 (Took Eric’s R-b on both because that’s how I interpreted his comments) git-backport-diff against v2: Key: [----] : patches are identical [####] : number of functional differences between upstream/downstream patch [down] : patch is downstream-only The flags [FC] indicate (F)unctional and (C)ontextual differences, respectively 001/23:[0010] [FC] 'iotests: Introduce $SOCK_DIR' 002/23:[----] [--] 'iotests.py: Store socket files in $SOCK_DIR' 003/23:[----] [--] 'iotests.py: Add @base_dir to FilePaths etc.' 004/23:[0002] [FC] 'iotests: Filter $SOCK_DIR' 005/23:[----] [--] 'iotests: Let common.nbd create socket in $SOCK_DIR' 006/23:[----] [--] 'iotests/083: Create socket in $SOCK_DIR' 007/23:[----] [--] 'iotests/140: Create socket in $SOCK_DIR' 008/23:[----] [--] 'iotests/143: Create socket in $SOCK_DIR' 009/23:[----] [--] 'iotests/147: Create socket in $SOCK_DIR' 010/23:[----] [--] 'iotests/181: Create socket in $SOCK_DIR' 011/23:[----] [--] 'iotests/182: Create socket in $SOCK_DIR' 012/23:[----] [--] 'iotests/183: Create socket in $SOCK_DIR' 013/23:[----] [--] 'iotests/192: Create socket in $SOCK_DIR' 014/23:[----] [--] 'iotests/194: Create sockets in $SOCK_DIR' 015/23:[----] [--] 'iotests/201: Create socket in $SOCK_DIR' 016/23:[----] [--] 'iotests/205: Create socket in $SOCK_DIR' 017/23:[----] [--] 'iotests/208: Create socket in $SOCK_DIR' 018/23:[----] [--] 'iotests/209: Create socket in $SOCK_DIR' 019/23:[----] [--] 'iotests/222: Create socket in $SOCK_DIR' 020/23:[----] [--] 'iotests/223: Create socket in $SOCK_DIR' 021/23:[----] [--] 'iotests/240: Create socket in $SOCK_DIR' 022/23:[----] [--] 'iotests/267: Create socket in $SOCK_DIR' 023/23:[0002] [FC] 'iotests: Drop TEST_DIR filter from _filter_nbd' Max Reitz (23): iotests: Introduce $SOCK_DIR iotests.py: Store socket files in $SOCK_DIR iotests.py: Add @base_dir to FilePaths etc. iotests: Filter $SOCK_DIR iotests: Let common.nbd create socket in $SOCK_DIR iotests/083: Create socket in $SOCK_DIR iotests/140: Create socket in $SOCK_DIR iotests/143: Create socket in $SOCK_DIR iotests/147: Create socket in $SOCK_DIR iotests/181: Create socket in $SOCK_DIR iotests/182: Create socket in $SOCK_DIR iotests/183: Create socket in $SOCK_DIR iotests/192: Create socket in $SOCK_DIR iotests/194: Create sockets in $SOCK_DIR iotests/201: Create socket in $SOCK_DIR iotests/205: Create socket in $SOCK_DIR iotests/208: Create socket in $SOCK_DIR iotests/209: Create socket in $SOCK_DIR iotests/222: Create socket in $SOCK_DIR iotests/223: Create socket in $SOCK_DIR iotests/240: Create socket in $SOCK_DIR iotests/267: Create socket in $SOCK_DIR iotests: Drop TEST_DIR filter from _filter_nbd python/qemu/machine.py | 15 +++++++++++--- python/qemu/qtest.py | 9 ++++++--- tests/qemu-iotests/083 | 6 +++--- tests/qemu-iotests/083.out | 34 ++++++++++++++++---------------- tests/qemu-iotests/140 | 8 ++++---- tests/qemu-iotests/140.out | 2 +- tests/qemu-iotests/143 | 6 +++--- tests/qemu-iotests/143.out | 2 +- tests/qemu-iotests/147 | 2 +- tests/qemu-iotests/181 | 2 +- tests/qemu-iotests/182 | 4 ++-- tests/qemu-iotests/183 | 2 +- tests/qemu-iotests/192 | 4 ++-- tests/qemu-iotests/192.out | 2 +- tests/qemu-iotests/194 | 4 ++-- tests/qemu-iotests/201 | 2 +- tests/qemu-iotests/205 | 2 +- tests/qemu-iotests/208 | 2 +- tests/qemu-iotests/209 | 3 ++- tests/qemu-iotests/222 | 2 +- tests/qemu-iotests/223 | 14 ++++++------- tests/qemu-iotests/240 | 4 ++-- tests/qemu-iotests/241 | 2 -- tests/qemu-iotests/267 | 4 ++-- tests/qemu-iotests/267.out | 2 +- tests/qemu-iotests/check | 15 ++++++++++++-- tests/qemu-iotests/common.filter | 7 +++++-- tests/qemu-iotests/common.nbd | 2 +- tests/qemu-iotests/iotests.py | 16 ++++++++------- 29 files changed, 103 insertions(+), 76 deletions(-)