On 20/08/21 15:16 +0100, Jonathan Wakely wrote:
Tests that depend on filesystem permissions FAIL if run on Windows or as
root. Add a helper function to detect those cases, so the tests can skip
those checks gracefully.

Signed-off-by: Jonathan Wakely <jwak...@redhat.com>

libstdc++-v3/ChangeLog:

        PR libstdc++/90787
        * testsuite/27_io/filesystem/iterators/directory_iterator.cc:
        Use new __gnu_test::permissions_are_testable() function.
        * testsuite/27_io/filesystem/iterators/recursive_directory_iterator.cc:
        Likewise.
        * testsuite/27_io/filesystem/operations/exists.cc: Likewise.
        * testsuite/27_io/filesystem/operations/is_empty.cc: Likewise.
        * testsuite/27_io/filesystem/operations/remove.cc: Likewise.
        * testsuite/27_io/filesystem/operations/remove_all.cc: Likewise.
        * testsuite/27_io/filesystem/operations/status.cc: Likewise.
        * testsuite/27_io/filesystem/operations/symlink_status.cc:
        Likewise.
        * testsuite/27_io/filesystem/operations/temp_directory_path.cc:
        Likewise.
        * testsuite/experimental/filesystem/iterators/directory_iterator.cc:
        Likewise.
        * 
testsuite/experimental/filesystem/iterators/recursive_directory_iterator.cc:
        Likewise.
        * testsuite/experimental/filesystem/operations/exists.cc:
        Likewise.
        * testsuite/experimental/filesystem/operations/is_empty.cc:
        Likewise.
        * testsuite/experimental/filesystem/operations/remove.cc:
        Likewise.
        * testsuite/experimental/filesystem/operations/remove_all.cc:
        Likewise.
        * testsuite/experimental/filesystem/operations/temp_directory_path.cc:
        Likewise.
        * testsuite/util/testsuite_fs.h (__gnu_test::permissions_are_testable):
        New function to guess whether testing permissions will work.

This causes new failures for bare metal targets where the path tests
run, even though the rest of the filesystem lib isn't supported.
That's because I forgot to make the new function inline, so it gets
compiled in every filesystem test, and so requires a definition of
geteuid even if the function isn't used.

Making the new function inline should be sufficient to fix that.

Tested powerpc64le-linux. Committed to trunk.

commit bc97e736a5597ac1545b7f9069472117b6caa867
Author: Jonathan Wakely <jwak...@redhat.com>
Date:   Mon Aug 23 13:05:25 2021

    libstdc++: Make permissions_are_testable function inline [PR90787]
    
    This function should be inline, so that's it's not emitted in tests that
    don't use it, to avoid undefined references to geteuid().
    
    libstdc++-v3/ChangeLog:
    
            PR libstdc++/90787
            * testsuite/util/testsuite_fs.h (permissions_are_testable):
            Define as inline.

diff --git a/libstdc++-v3/testsuite/util/testsuite_fs.h b/libstdc++-v3/testsuite/util/testsuite_fs.h
index 674b60b83d2..0d32a616840 100644
--- a/libstdc++-v3/testsuite/util/testsuite_fs.h
+++ b/libstdc++-v3/testsuite/util/testsuite_fs.h
@@ -160,7 +160,7 @@ namespace __gnu_test
     path_type path;
   };
 
-  bool
+  inline bool
   permissions_are_testable(bool print_msg = true)
   {
     bool testable = false;

Reply via email to