From patchwork Sat Jan 22 19:12:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Christian Schoenebeck X-Patchwork-Id: 12720829 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 6A048C433F5 for ; Sat, 22 Jan 2022 20:14:43 +0000 (UTC) Received: from localhost ([::1]:41158 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nBMmY-0003mz-44 for qemu-devel@archiver.kernel.org; Sat, 22 Jan 2022 15:14:42 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51866) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nBMl9-00036y-Md for qemu-devel@nongnu.org; Sat, 22 Jan 2022 15:13:16 -0500 Received: from lizzy.crudebyte.com ([91.194.90.13]:34973) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nBMl7-00083n-Rt for qemu-devel@nongnu.org; Sat, 22 Jan 2022 15:13:15 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=crudebyte.com; s=lizzy; h=Cc:To:Content-Transfer-Encoding:Content-Type: MIME-Version:Subject:Date:From:Message-Id:References:In-Reply-To:Content-ID: Content-Description; bh=1rxteShGbGr0HytmhaIkOB+CBuQvAnTZiOrMYDBSLf0=; b=T7E+h lUK1lYOrLiMAFiUdDnGKyaDNVLQWVBdQ+zIB2qDMnNIG9qisnkqvO6M/wBzgFh3W1Mdr6Plf0xYTG snA3RM0sIr2AsclycMl2LhpTV0WwZiBSSMjXYr20lIQ8ByeBB+DdqYZv99v9noL9jpntpg7EyD63g F9R07/H69/N0bqXiN1ojERs7krreumuhhetsKC0ewLCFCfxLBqBljHG7uaZU/iwzWofc+a8jNMga+ OQP2Qv0WtJl6w0bsjoSUQdhhX6nnpyaIRFRs92hBiwl5yPhhVJWExX8vXZX3v/5D0O5qrLZgGFmB0 e67uDy+eWh5LqdcOqJtp8vi3tRbjQ==; Message-Id: From: Christian Schoenebeck Date: Sat, 22 Jan 2022 20:12:16 +0100 Subject: [PATCH] tests/9pfs: fix mkdir() being called twice MIME-Version: 1.0 To: qemu-devel@nongnu.org Cc: =?unknown-8bit?b?R3JlZyBLdXJ6IDxncm91Z0BrYW9kLm9yZz4s?= =?unknown-8bit?b?ICJEYW5pZWwgUC4gQmVycmFuZ8OpIiA8YmVycmFuZ2VAcmVkaGF0LmNv?= =?unknown-8bit?b?bT4s?= =?unknown-8bit?q?_Thomas_Huth_=3Cthuth=40redhat=2Ecom=3E=2C?= =?unknown-8bit?q?_Alex_Benn=C3=A9e_=3Calex=2Ebennee=40linaro=2Eorg=3E?= Received-SPF: none client-ip=91.194.90.13; envelope-from=f6602123c6f7d0d593466231b04fba087817abbd@lizzy.crudebyte.com; helo=lizzy.crudebyte.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" The 9p test cases use mkdtemp() to create a temporary directory for running the 'local' 9p tests with real files/dirs. Unlike mktemp() which only generates a unique file name, mkdtemp() also creates the directory, therefore the subsequent mkdir() was wrong and caused errors on some systems. Signed-off-by: Christian Schoenebeck Fixes: 136b7af2 (tests/9pfs: fix test dir for parallel tests) Reported-by: Daniel P. Berrangé Resolves: https://gitlab.com/qemu-project/qemu/-/issues/832 Reviewed-by: Daniel P. Berrangé Reviewed-by: Greg Kurz --- tests/qtest/libqos/virtio-9p.c | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/tests/qtest/libqos/virtio-9p.c b/tests/qtest/libqos/virtio-9p.c index b4e1143288..ef96ef006a 100644 --- a/tests/qtest/libqos/virtio-9p.c +++ b/tests/qtest/libqos/virtio-9p.c @@ -37,31 +37,19 @@ static char *concat_path(const char* a, const char* b) return g_build_filename(a, b, NULL); } -static void init_local_test_path(void) +void virtio_9p_create_local_test_dir(void) { + struct stat st; char *pwd = g_get_current_dir(); char *template = concat_path(pwd, "qtest-9p-local-XXXXXX"); + local_test_path = mkdtemp(template); if (!local_test_path) { g_test_message("mkdtemp('%s') failed: %s", template, strerror(errno)); } - g_assert(local_test_path); g_free(pwd); -} - -void virtio_9p_create_local_test_dir(void) -{ - struct stat st; - int res; - - init_local_test_path(); g_assert(local_test_path != NULL); - res = mkdir(local_test_path, 0777); - if (res < 0) { - g_test_message("mkdir('%s') failed: %s", local_test_path, - strerror(errno)); - } /* ensure test directory exists now ... */ g_assert(stat(local_test_path, &st) == 0);