From mboxrd@z Thu Jan 1 00:00:00 1970 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 D2296C00140 for ; Wed, 24 Aug 2022 18:11:37 +0000 (UTC) Received: from localhost ([::1]:55926 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oQuqm-0000Oy-Pu for qemu-devel@archiver.kernel.org; Wed, 24 Aug 2022 14:11:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46424) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oQueR-00034x-4G for qemu-devel@nongnu.org; Wed, 24 Aug 2022 13:58:51 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:50582) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oQueO-0007lp-AS for qemu-devel@nongnu.org; Wed, 24 Aug 2022 13:58:50 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1661363927; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=2GjP2TJV00IIK9JWMYv364NrPn1HOWoOzoxEHncWeGw=; b=PZPUoSQ7ODFtqwF37v7czpuUJqMCBvg2UdVuv+gTUq58JC8B+WC8saTtm7NfuoUazm7gMZ EjcH5mxU1Hz90xVXiXTZXnDzzcUjEuN7+4Eom6nIiXx9ssNYBDWsFVSWKeo4FJ5VB6rztw xvwetNe2MRN23yX505VlWgyzHrajfAg= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-82-Hf1dkHuiP_OO5uaw_BV3sw-1; Wed, 24 Aug 2022 13:58:45 -0400 X-MC-Unique: Hf1dkHuiP_OO5uaw_BV3sw-1 Received: by mail-wm1-f69.google.com with SMTP id r10-20020a1c440a000000b003a538a648a9so9698278wma.5 for ; Wed, 24 Aug 2022 10:58:45 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=user-agent:in-reply-to:content-disposition:mime-version:references :message-id:subject:cc:to:from:date:x-gm-message-state:from:to:cc; bh=2GjP2TJV00IIK9JWMYv364NrPn1HOWoOzoxEHncWeGw=; b=0ok3dSn8v0pzR+jL4wKFT4NEheJgu6Ku1q0bBej2eWPvOBcnED3HCyKXNes0HVh7wb sp1Kw3kmZ69YvLFRWW3uy+cWqJuYftrWvnzuUJ+eazyiAkE7IF6yADmgZQMzN7rAxPMI iQLnTbpOxhj3qcic13hKvX5Zuol+aTN3HReal7VogFHPeiXvwjs7No+uu0WDa3Hai6gx 2N0kW1RmUuiCtTNsiUhpinIMR6/lqxJXd7+3rQUbp96MAuA9kwN4k2pRHFdNiOku7xYO ISdGwcGRP8/eOVN1lwEdqrf41Q7k2OIVPjq6vVytKQ7cyJAn8M6AqCMwPChFDZx1Al+P fDmg== X-Gm-Message-State: ACgBeo27HCj0mFpVkAKAOCFIYfP+tUI/X8GuuZzDYaCOdlZrOeDHX2/Z l/KE7zdZy2L4U/d0HAV3DdWgHd29qR8cBkmALD/PW6eTuGyQWOl9qX6Emh1HsU6H5LS6Qtn9srj qZJflEdo43k06nHE= X-Received: by 2002:a05:600c:22c7:b0:3a6:68e4:1e5f with SMTP id 7-20020a05600c22c700b003a668e41e5fmr48560wmg.46.1661363924785; Wed, 24 Aug 2022 10:58:44 -0700 (PDT) X-Google-Smtp-Source: AA6agR6fdW1P+oxyMbyY3NT5GMdvSAcl7r0yPTcikc4t2iL24Uhrm87qAj3QODdtgnSlFbBtyLGPEA== X-Received: by 2002:a05:600c:22c7:b0:3a6:68e4:1e5f with SMTP id 7-20020a05600c22c700b003a668e41e5fmr48545wmg.46.1661363924499; Wed, 24 Aug 2022 10:58:44 -0700 (PDT) Received: from work-vm (cpc109025-salf6-2-0-cust480.10-2.cable.virginm.net. [82.30.61.225]) by smtp.gmail.com with ESMTPSA id a17-20020adffb91000000b002207a0b93b4sm17574756wrr.49.2022.08.24.10.58.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Aug 2022 10:58:43 -0700 (PDT) Date: Wed, 24 Aug 2022 18:58:42 +0100 From: "Dr. David Alan Gilbert" To: Bin Meng Cc: qemu-devel@nongnu.org, Bin Meng , Daniel =?iso-8859-1?Q?P=2E_Berrang=E9?= , Juan Quintela , Laurent Vivier , Paolo Bonzini , Thomas Huth Subject: Re: [PATCH 12/51] tests: Use g_mkdir_with_parents() Message-ID: References: <20220824094029.1634519-1-bmeng.cn@gmail.com> <20220824094029.1634519-13-bmeng.cn@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220824094029.1634519-13-bmeng.cn@gmail.com> User-Agent: Mutt/2.2.6 (2022-06-05) Received-SPF: pass client-ip=170.10.133.124; envelope-from=dgilbert@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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" * Bin Meng (bmeng.cn@gmail.com) wrote: > From: Bin Meng > > Use the same g_mkdir_with_parents() call to create a directory on > all platforms. > > Signed-off-by: Bin Meng Reviewed-by: Dr. David Alan Gilbert > --- > > tests/migration/stress.c | 2 +- > tests/qtest/migration-test.c | 6 +++--- > tests/unit/test-crypto-tlscredsx509.c | 4 ++-- > tests/unit/test-crypto-tlssession.c | 6 +++--- > tests/unit/test-io-channel-tls.c | 6 +++--- > 5 files changed, 12 insertions(+), 12 deletions(-) > > diff --git a/tests/migration/stress.c b/tests/migration/stress.c > index b7240a15c8..88acf8dc25 100644 > --- a/tests/migration/stress.c > +++ b/tests/migration/stress.c > @@ -232,7 +232,7 @@ static void stress(unsigned long long ramsizeGB, int ncpus) > > static int mount_misc(const char *fstype, const char *dir) > { > - if (mkdir(dir, 0755) < 0 && errno != EEXIST) { > + if (g_mkdir_with_parents(dir, 0755) < 0 && errno != EEXIST) { > fprintf(stderr, "%s (%05d): ERROR: cannot create %s: %s\n", > argv0, gettid(), dir, strerror(errno)); > return -1; > diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c > index 5fa4ffeff0..38356d4aba 100644 > --- a/tests/qtest/migration-test.c > +++ b/tests/qtest/migration-test.c > @@ -761,14 +761,14 @@ test_migrate_tls_psk_start_common(QTestState *from, > data->workdir = g_strdup_printf("%s/tlscredspsk0", tmpfs); > data->pskfile = g_strdup_printf("%s/%s", data->workdir, > QCRYPTO_TLS_CREDS_PSKFILE); > - mkdir(data->workdir, 0700); > + g_mkdir_with_parents(data->workdir, 0700); > test_tls_psk_init(data->pskfile); > > if (mismatch) { > data->workdiralt = g_strdup_printf("%s/tlscredspskalt0", tmpfs); > data->pskfilealt = g_strdup_printf("%s/%s", data->workdiralt, > QCRYPTO_TLS_CREDS_PSKFILE); > - mkdir(data->workdiralt, 0700); > + g_mkdir_with_parents(data->workdiralt, 0700); > test_tls_psk_init_alt(data->pskfilealt); > } > > @@ -873,7 +873,7 @@ test_migrate_tls_x509_start_common(QTestState *from, > data->clientcert = g_strdup_printf("%s/client-cert.pem", data->workdir); > } > > - mkdir(data->workdir, 0700); > + g_mkdir_with_parents(data->workdir, 0700); > > test_tls_init(data->keyfile); > g_assert(link(data->keyfile, data->serverkey) == 0); > diff --git a/tests/unit/test-crypto-tlscredsx509.c b/tests/unit/test-crypto-tlscredsx509.c > index aab4149b56..3c25d75ca1 100644 > --- a/tests/unit/test-crypto-tlscredsx509.c > +++ b/tests/unit/test-crypto-tlscredsx509.c > @@ -75,7 +75,7 @@ static void test_tls_creds(const void *opaque) > QCryptoTLSCreds *creds; > > #define CERT_DIR "tests/test-crypto-tlscredsx509-certs/" > - mkdir(CERT_DIR, 0700); > + g_mkdir_with_parents(CERT_DIR, 0700); > > unlink(CERT_DIR QCRYPTO_TLS_CREDS_X509_CA_CERT); > if (data->isServer) { > @@ -141,7 +141,7 @@ int main(int argc, char **argv) > g_test_init(&argc, &argv, NULL); > g_setenv("GNUTLS_FORCE_FIPS_MODE", "2", 1); > > - mkdir(WORKDIR, 0700); > + g_mkdir_with_parents(WORKDIR, 0700); > > test_tls_init(KEYFILE); > > diff --git a/tests/unit/test-crypto-tlssession.c b/tests/unit/test-crypto-tlssession.c > index f222959d36..615a1344b4 100644 > --- a/tests/unit/test-crypto-tlssession.c > +++ b/tests/unit/test-crypto-tlssession.c > @@ -249,8 +249,8 @@ static void test_crypto_tls_session_x509(const void *opaque) > > #define CLIENT_CERT_DIR "tests/test-crypto-tlssession-client/" > #define SERVER_CERT_DIR "tests/test-crypto-tlssession-server/" > - mkdir(CLIENT_CERT_DIR, 0700); > - mkdir(SERVER_CERT_DIR, 0700); > + g_mkdir_with_parents(CLIENT_CERT_DIR, 0700); > + g_mkdir_with_parents(SERVER_CERT_DIR, 0700); > > unlink(SERVER_CERT_DIR QCRYPTO_TLS_CREDS_X509_CA_CERT); > unlink(SERVER_CERT_DIR QCRYPTO_TLS_CREDS_X509_SERVER_CERT); > @@ -398,7 +398,7 @@ int main(int argc, char **argv) > g_test_init(&argc, &argv, NULL); > g_setenv("GNUTLS_FORCE_FIPS_MODE", "2", 1); > > - mkdir(WORKDIR, 0700); > + g_mkdir_with_parents(WORKDIR, 0700); > > test_tls_init(KEYFILE); > test_tls_psk_init(PSKFILE); > diff --git a/tests/unit/test-io-channel-tls.c b/tests/unit/test-io-channel-tls.c > index f6fb988c01..cc39247556 100644 > --- a/tests/unit/test-io-channel-tls.c > +++ b/tests/unit/test-io-channel-tls.c > @@ -125,8 +125,8 @@ static void test_io_channel_tls(const void *opaque) > > #define CLIENT_CERT_DIR "tests/test-io-channel-tls-client/" > #define SERVER_CERT_DIR "tests/test-io-channel-tls-server/" > - mkdir(CLIENT_CERT_DIR, 0700); > - mkdir(SERVER_CERT_DIR, 0700); > + g_mkdir_with_parents(CLIENT_CERT_DIR, 0700); > + g_mkdir_with_parents(SERVER_CERT_DIR, 0700); > > unlink(SERVER_CERT_DIR QCRYPTO_TLS_CREDS_X509_CA_CERT); > unlink(SERVER_CERT_DIR QCRYPTO_TLS_CREDS_X509_SERVER_CERT); > @@ -273,7 +273,7 @@ int main(int argc, char **argv) > g_test_init(&argc, &argv, NULL); > g_setenv("GNUTLS_FORCE_FIPS_MODE", "2", 1); > > - mkdir(WORKDIR, 0700); > + g_mkdir_with_parents(WORKDIR, 0700); > > test_tls_init(KEYFILE); > > -- > 2.34.1 > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK