From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id CB6FF3857831 for ; Thu, 23 Jun 2022 11:30:36 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org CB6FF3857831 Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-189-EQ-mkUTdOi-wXjvIzMCURA-1; Thu, 23 Jun 2022 07:30:35 -0400 X-MC-Unique: EQ-mkUTdOi-wXjvIzMCURA-1 Received: by mail-ed1-f69.google.com with SMTP id g7-20020a056402424700b00435ac9c7a8bso3636847edb.14 for ; Thu, 23 Jun 2022 04:30:35 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=ne8AfHs/KpDbfTZGcczZkg2BaUQBPanR7a/BpVQQq6E=; b=hZkTHEc245O9PX1rINisihTZ2zAPJOKDzQAvP+B4r9aNEEqgI3/sYnzzu7wVmPPMqL tR6pROkaZPNG/gIUhjS37Obci2Uotpu+eK55b7bmOwh+J2MoKMcs6rPPL152Ufd1LCkz ZS5gJ5cD/0o+t5I3OAYWXzW0LItJxx11zyrNEjVDIU77lMlhkl4d1yVUm8dtw9yIBsHA hVEkq2uNTlQ4oK+JZfZdiJvm03qsIl3z7y/W1UXkrkLPK5Cwa3/j7foMnB5R8/W3R1oC /5NpqoydB+ZtlhzftySl1WZVwQfi7Bc+XY+6+S//D3H4Zf0INfc+nG5i1uJCvENS+US8 hEkg== X-Gm-Message-State: AJIora/qmuIh0PTsz4VM/7EGpX8b0InBr2eXU7JpQ4aOKFKk/MxCw21c NgYvfN4fvlfXh0bYuGPnUhi33drOUOkFYSteqOxL/wIFak8Rosbfr3mqGw2yyD138Yv0Bj7sB0b wgqF8QrPjODkK5VL00JM296P7D91Telk= X-Received: by 2002:a17:906:65c8:b0:713:ee3e:254d with SMTP id z8-20020a17090665c800b00713ee3e254dmr7928203ejn.0.1655983834279; Thu, 23 Jun 2022 04:30:34 -0700 (PDT) X-Google-Smtp-Source: AGRyM1tGrb8LiipISJRPzmeUbACzGj8pYCTHJovSGD+BGM1CpgwLAwHcbawGNZqK2zr9QG/pVfcf/U/QuTfFaxYR890= X-Received: by 2002:a17:906:65c8:b0:713:ee3e:254d with SMTP id z8-20020a17090665c800b00713ee3e254dmr7928192ejn.0.1655983834091; Thu, 23 Jun 2022 04:30:34 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Jonathan Wakely Date: Thu, 23 Jun 2022 12:30:23 +0100 Message-ID: Subject: Re: [PATCH] libstdc++: testsuite: skip fs last_write_time tests if not available To: Alexandre Oliva Cc: gcc Patches , "libstdc++" X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-13.9 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libstdc++@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++ mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Jun 2022 11:30:38 -0000 On Thu, 23 Jun 2022 at 12:05, Alexandre Oliva wrote: > > On Jun 22, 2022, Jonathan Wakely wrote: > > > And again, this could be a macro defined in testsuite_fs.h > > Done. (it depends on dg changes in the symlink patch) > > Regstrapped on x86_64-linux-gnu, also tested with a cross to > aarch64-rtems6. Ok to install? OK (after the NO_SYMLINKS one gets finished and committed obviously). > > > libstdc++: testsuite: skip fs space tests on dummy implementations > > The do_space function is defined in ways that are useful, or that fail > immediately, depending on various macros. When it fails immediately, > the filesystem space.cc tests fail noisily, but the fail is entirely > expected. > > Define NO_SPACE in testsuite_fs.h, according to the macros that select > implementations of do_space, and use it to skip tests that are > expected to fail, through a new dg-require. > > > for libstdc++-v3/ChangeLog > > * testsuite/util/testsuite_fs.h (NO_SPACE): Define if > appropriate. > * testsuite/lib/libstdc++.exp (check_v3_target_fs_space): New. > * testsuite/lib/dg-options.exp (dg-require-target-fs-space): > New. > * testsuite/27_io/filesystem/operations/space.cc: Require > target-fs-space. > * testsuite/experimental/filesystem/operations/space.cc: > Likewise. > --- > .../testsuite/27_io/filesystem/operations/space.cc | 1 + > .../experimental/filesystem/operations/space.cc | 1 + > libstdc++-v3/testsuite/lib/dg-options.exp | 9 +++++++++ > libstdc++-v3/testsuite/lib/libstdc++.exp | 8 ++++++++ > libstdc++-v3/testsuite/util/testsuite_fs.h | 5 +++++ > 5 files changed, 24 insertions(+) > > diff --git a/libstdc++-v3/testsuite/27_io/filesystem/operations/space.cc b/libstdc++-v3/testsuite/27_io/filesystem/operations/space.cc > index 05997cac1dfa4..daa1ce439f30d 100644 > --- a/libstdc++-v3/testsuite/27_io/filesystem/operations/space.cc > +++ b/libstdc++-v3/testsuite/27_io/filesystem/operations/space.cc > @@ -17,6 +17,7 @@ > > // { dg-do run { target c++17 } } > // { dg-require-filesystem-ts "" } > +// { dg-require-target-fs-space "" } > > // 30.10.14.3 Permissions [fs.op.space] > > diff --git a/libstdc++-v3/testsuite/experimental/filesystem/operations/space.cc b/libstdc++-v3/testsuite/experimental/filesystem/operations/space.cc > index 10ee0f06871df..c3745a2686635 100644 > --- a/libstdc++-v3/testsuite/experimental/filesystem/operations/space.cc > +++ b/libstdc++-v3/testsuite/experimental/filesystem/operations/space.cc > @@ -18,6 +18,7 @@ > // { dg-options "-DUSE_FILESYSTEM_TS -lstdc++fs" } > // { dg-do run { target c++11 } } > // { dg-require-filesystem-ts "" } > +// { dg-require-target-fs-space "" } > > // 30.10.14.3 Permissions [fs.op.space] > > diff --git a/libstdc++-v3/testsuite/lib/dg-options.exp b/libstdc++-v3/testsuite/lib/dg-options.exp > index e624a69460ed6..81bb8f448bd44 100644 > --- a/libstdc++-v3/testsuite/lib/dg-options.exp > +++ b/libstdc++-v3/testsuite/lib/dg-options.exp > @@ -250,6 +250,15 @@ proc dg-require-target-fs-symlinks { args } { > return > } > > +proc dg-require-target-fs-space { args } { > + if { ![ check_v3_target_fs_space ] } { > + upvar dg-do-what dg-do-what > + set dg-do-what [list [lindex ${dg-do-what} 0] "N" "P"] > + return > + } > + return > +} > + > proc add_options_for_no_pch { flags } { > # This forces any generated and possibly included PCH to be invalid. > return "-D__GLIBCXX__=99999999" > diff --git a/libstdc++-v3/testsuite/lib/libstdc++.exp b/libstdc++-v3/testsuite/lib/libstdc++.exp > index d71d88fb99837..22fdde8d66374 100644 > --- a/libstdc++-v3/testsuite/lib/libstdc++.exp > +++ b/libstdc++-v3/testsuite/lib/libstdc++.exp > @@ -1278,6 +1278,14 @@ proc check_v3_target_fs_symlinks { } { > return [v3_check_preprocessor_condition fs_symlinks $cond $inc] > } > > +# Return 1 if the libstdc++ filesystem implementation of space is not an > +# always-failing dummy. > +proc check_v3_target_fs_space { } { > + set inc "#include " > + set cond "!defined NO_SPACE" > + return [v3_check_preprocessor_condition fs_space $cond $inc] > +} > + > # Return 1 if the "cxx11" ABI is in use using the current flags, 0 otherwise. > # Any flags provided by RUNTESTFLAGS or a target board will be used here. > # Flags added in the test by dg-options or dg-add-options will not be used. > diff --git a/libstdc++-v3/testsuite/util/testsuite_fs.h b/libstdc++-v3/testsuite/util/testsuite_fs.h > index 048f03103e436..89042e5534139 100644 > --- a/libstdc++-v3/testsuite/util/testsuite_fs.h > +++ b/libstdc++-v3/testsuite/util/testsuite_fs.h > @@ -47,6 +47,11 @@ namespace test_fs = std::experimental::filesystem; > #define NO_SYMLINKS > #endif > > +#if !defined (_GLIBCXX_HAVE_SYS_STATVFS_H) \ > + && !defined (_GLIBCXX_FILESYSTEM_IS_WINDOWS) > +#define NO_SPACE > +#endif > + > namespace __gnu_test > { > #define PATH_CHK(p1, p2, fn) \ > > > -- > Alexandre Oliva, happy hacker https://FSFLA.org/blogs/lxo/ > Free Software Activist GNU Toolchain Engineer > Disinformation flourishes because many people care deeply about injustice > but very few check the facts. Ask me about >