This is an archive of the discontinued LLVM Phabricator instance.

Differential D151825

[libc++][NFC] Use TEST_HAS_NO_FILESYSTEM_LIBRARY in the test suite
ClosedPublic

Authored by ldionne on May 31 2023, 11:41 AM.

Details

Reviewers
Mordante
Group Reviewers
Restricted Project
Commits
rG185739af4e44: [libc++][NFC] Use TEST_HAS_NO_FILESYSTEM_LIBRARY in the test suite
Summary

This replaces some uses of internal libc++ macros with the equivalent
macro from "test_macros.h".

Diff Detail

Event Timeline

ldionne created this revision.May 31 2023, 11:41 AM
Herald added a project: Restricted Project. · View Herald TranscriptMay 31 2023, 11:41 AM
ldionne requested review of this revision.May 31 2023, 11:41 AM
Herald added a project: Restricted Project. · View Herald TranscriptMay 31 2023, 11:41 AM
Herald added a reviewer: Restricted Project. · View Herald Transcript
Herald added a subscriber: libcxx-commits. · View Herald Transcript
Mordante accepted this revision.May 31 2023, 12:35 PM
Mordante added a subscriber: Mordante.

LGTM, thanks for fixing this.

This revision is now accepted and ready to land.May 31 2023, 12:35 PM
Harbormaster completed remote builds in B235634: Diff 527146.May 31 2023, 6:33 PM
Closed by commit rG185739af4e44: [libc++][NFC] Use TEST_HAS_NO_FILESYSTEM_LIBRARY in the test suite (authored by ldionne). · Explain WhyJun 1 2023, 8:20 AM
This revision was automatically updated to reflect the committed changes.
ldionne added a commit: rG185739af4e44: [libc++][NFC] Use TEST_HAS_NO_FILESYSTEM_LIBRARY in the test suite.

Revision Contents

Diff 527429

libcxx/test/libcxx/iterators/iterator.requirements/iterator.assoc.types/iterator.traits/legacy_bidirectional_iterator.compile.pass.cpp

//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
// //
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information. // See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
// UNSUPPORTED: c++03, c++11, c++14, c++17 // UNSUPPORTED: c++03, c++11, c++14, c++17
// This test uses iterator types from std::filesystem // This test uses iterator types from std::filesystem
// XFAIL: availability-filesystem-missing // XFAIL: availability-filesystem-missing
// template<class I> // template<class I>
// concept __iterator_traits_detail::__cpp17_bidirectional_iterator; // concept __iterator_traits_detail::__cpp17_bidirectional_iterator;
#include "test_macros.h"
#include <iterator> #include <iterator>
#include <array> #include <array>
#include <deque> #include <deque>
#ifndef _LIBCPP_HAS_NO_FILESYSTEM_LIBRARY #ifndef TEST_HAS_NO_FILESYSTEM_LIBRARY
#include <filesystem> #include <filesystem>
#endif #endif
#include <forward_list> #include <forward_list>
#include <list> #include <list>
#include <map> #include <map>
#include <set> #include <set>
#include <string> #include <string>
#include <string_view> #include <string_view>
Show All 24 Lines
// <deque> // <deque>
static_assert(std::__iterator_traits_detail::__cpp17_bidirectional_iterator<std::deque<int>::iterator>); static_assert(std::__iterator_traits_detail::__cpp17_bidirectional_iterator<std::deque<int>::iterator>);
static_assert(std::__iterator_traits_detail::__cpp17_bidirectional_iterator<std::deque<int>::const_iterator>); static_assert(std::__iterator_traits_detail::__cpp17_bidirectional_iterator<std::deque<int>::const_iterator>);
static_assert(std::__iterator_traits_detail::__cpp17_bidirectional_iterator<std::deque<int>::reverse_iterator>); static_assert(std::__iterator_traits_detail::__cpp17_bidirectional_iterator<std::deque<int>::reverse_iterator>);
static_assert(std::__iterator_traits_detail::__cpp17_bidirectional_iterator<std::deque<int>::const_reverse_iterator>); static_assert(std::__iterator_traits_detail::__cpp17_bidirectional_iterator<std::deque<int>::const_reverse_iterator>);
// <filesystem> // <filesystem>
#ifndef _LIBCPP_HAS_NO_FILESYSTEM_LIBRARY #ifndef TEST_HAS_NO_FILESYSTEM_LIBRARY
static_assert(!std::__iterator_traits_detail::__cpp17_bidirectional_iterator<std::filesystem::directory_iterator>); static_assert(!std::__iterator_traits_detail::__cpp17_bidirectional_iterator<std::filesystem::directory_iterator>);
static_assert(!std::__iterator_traits_detail::__cpp17_bidirectional_iterator<std::filesystem::recursive_directory_iterator>); static_assert(!std::__iterator_traits_detail::__cpp17_bidirectional_iterator<std::filesystem::recursive_directory_iterator>);
#endif #endif
// <forward_list> // <forward_list>
static_assert(!std::__iterator_traits_detail::__cpp17_bidirectional_iterator<std::forward_list<int>::iterator>); static_assert(!std::__iterator_traits_detail::__cpp17_bidirectional_iterator<std::forward_list<int>::iterator>);
static_assert(!std::__iterator_traits_detail::__cpp17_bidirectional_iterator<std::forward_list<int>::const_iterator>); static_assert(!std::__iterator_traits_detail::__cpp17_bidirectional_iterator<std::forward_list<int>::const_iterator>);
▲ Show 20 Lines • Show All 92 Lines • Show Last 20 Lines

libcxx/test/libcxx/iterators/iterator.requirements/iterator.assoc.types/iterator.traits/legacy_forward_iterator.compile.pass.cpp

//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
// //
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information. // See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
// UNSUPPORTED: c++03, c++11, c++14, c++17 // UNSUPPORTED: c++03, c++11, c++14, c++17
// This test uses iterator types from std::filesystem // This test uses iterator types from std::filesystem
// XFAIL: availability-filesystem-missing // XFAIL: availability-filesystem-missing
// template<class I> // template<class I>
// concept __iterator_traits_detail::__cpp17_forward_iterator; // concept __iterator_traits_detail::__cpp17_forward_iterator;
#include "test_macros.h"
#include <iterator> #include <iterator>
#include <array> #include <array>
#include <deque> #include <deque>
#ifndef _LIBCPP_HAS_NO_FILESYSTEM_LIBRARY #ifndef TEST_HAS_NO_FILESYSTEM_LIBRARY
#include <filesystem> #include <filesystem>
#endif #endif
#include <forward_list> #include <forward_list>
#include <list> #include <list>
#include <map> #include <map>
#include <set> #include <set>
#include <string> #include <string>
#include <string_view> #include <string_view>
Show All 24 Lines
// <deque> // <deque>
static_assert(std::__iterator_traits_detail::__cpp17_forward_iterator<std::deque<int>::iterator>); static_assert(std::__iterator_traits_detail::__cpp17_forward_iterator<std::deque<int>::iterator>);
static_assert(std::__iterator_traits_detail::__cpp17_forward_iterator<std::deque<int>::const_iterator>); static_assert(std::__iterator_traits_detail::__cpp17_forward_iterator<std::deque<int>::const_iterator>);
static_assert(std::__iterator_traits_detail::__cpp17_forward_iterator<std::deque<int>::reverse_iterator>); static_assert(std::__iterator_traits_detail::__cpp17_forward_iterator<std::deque<int>::reverse_iterator>);
static_assert(std::__iterator_traits_detail::__cpp17_forward_iterator<std::deque<int>::const_reverse_iterator>); static_assert(std::__iterator_traits_detail::__cpp17_forward_iterator<std::deque<int>::const_reverse_iterator>);
// <filesystem> // <filesystem>
#ifndef _LIBCPP_HAS_NO_FILESYSTEM_LIBRARY #ifndef TEST_HAS_NO_FILESYSTEM_LIBRARY
static_assert(!std::__iterator_traits_detail::__cpp17_forward_iterator<std::filesystem::directory_iterator>); static_assert(!std::__iterator_traits_detail::__cpp17_forward_iterator<std::filesystem::directory_iterator>);
static_assert(!std::__iterator_traits_detail::__cpp17_forward_iterator<std::filesystem::recursive_directory_iterator>); static_assert(!std::__iterator_traits_detail::__cpp17_forward_iterator<std::filesystem::recursive_directory_iterator>);
#endif #endif
// <forward_list> // <forward_list>
static_assert(std::__iterator_traits_detail::__cpp17_forward_iterator<std::forward_list<int>::iterator>); static_assert(std::__iterator_traits_detail::__cpp17_forward_iterator<std::forward_list<int>::iterator>);
static_assert(std::__iterator_traits_detail::__cpp17_forward_iterator<std::forward_list<int>::const_iterator>); static_assert(std::__iterator_traits_detail::__cpp17_forward_iterator<std::forward_list<int>::const_iterator>);
▲ Show 20 Lines • Show All 92 Lines • Show Last 20 Lines

libcxx/test/libcxx/iterators/iterator.requirements/iterator.assoc.types/iterator.traits/legacy_input_iterator.compile.pass.cpp

//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
// //
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information. // See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
// UNSUPPORTED: c++03, c++11, c++14, c++17 // UNSUPPORTED: c++03, c++11, c++14, c++17
// This test uses iterator types from std::filesystem // This test uses iterator types from std::filesystem
// XFAIL: availability-filesystem-missing // XFAIL: availability-filesystem-missing
// template<class I> // template<class I>
// concept __iterator_traits_detail::__cpp17_input_iterator; // concept __iterator_traits_detail::__cpp17_input_iterator;
#include "test_macros.h"
#include <iterator> #include <iterator>
#include <array> #include <array>
#include <deque> #include <deque>
#ifndef _LIBCPP_HAS_NO_FILESYSTEM_LIBRARY #ifndef TEST_HAS_NO_FILESYSTEM_LIBRARY
#include <filesystem> #include <filesystem>
#endif #endif
#include <forward_list> #include <forward_list>
#include <list> #include <list>
#include <map> #include <map>
#include <set> #include <set>
#include <string> #include <string>
#include <string_view> #include <string_view>
Show All 24 Lines
// <deque> // <deque>
static_assert(std::__iterator_traits_detail::__cpp17_input_iterator<std::deque<int>::iterator>); static_assert(std::__iterator_traits_detail::__cpp17_input_iterator<std::deque<int>::iterator>);
static_assert(std::__iterator_traits_detail::__cpp17_input_iterator<std::deque<int>::const_iterator>); static_assert(std::__iterator_traits_detail::__cpp17_input_iterator<std::deque<int>::const_iterator>);
static_assert(std::__iterator_traits_detail::__cpp17_input_iterator<std::deque<int>::reverse_iterator>); static_assert(std::__iterator_traits_detail::__cpp17_input_iterator<std::deque<int>::reverse_iterator>);
static_assert(std::__iterator_traits_detail::__cpp17_input_iterator<std::deque<int>::const_reverse_iterator>); static_assert(std::__iterator_traits_detail::__cpp17_input_iterator<std::deque<int>::const_reverse_iterator>);
// <filesystem> // <filesystem>
#ifndef _LIBCPP_HAS_NO_FILESYSTEM_LIBRARY #ifndef TEST_HAS_NO_FILESYSTEM_LIBRARY
static_assert(std::__iterator_traits_detail::__cpp17_input_iterator<std::filesystem::directory_iterator>); static_assert(std::__iterator_traits_detail::__cpp17_input_iterator<std::filesystem::directory_iterator>);
static_assert(std::__iterator_traits_detail::__cpp17_input_iterator<std::filesystem::recursive_directory_iterator>); static_assert(std::__iterator_traits_detail::__cpp17_input_iterator<std::filesystem::recursive_directory_iterator>);
#endif #endif
// <forward_list> // <forward_list>
static_assert(std::__iterator_traits_detail::__cpp17_input_iterator<std::forward_list<int>::iterator>); static_assert(std::__iterator_traits_detail::__cpp17_input_iterator<std::forward_list<int>::iterator>);
static_assert(std::__iterator_traits_detail::__cpp17_input_iterator<std::forward_list<int>::const_iterator>); static_assert(std::__iterator_traits_detail::__cpp17_input_iterator<std::forward_list<int>::const_iterator>);
▲ Show 20 Lines • Show All 92 Lines • Show Last 20 Lines

libcxx/test/libcxx/iterators/iterator.requirements/iterator.assoc.types/iterator.traits/legacy_iterator.compile.pass.cpp

//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
// //
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information. // See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
// UNSUPPORTED: c++03, c++11, c++14, c++17 // UNSUPPORTED: c++03, c++11, c++14, c++17
// This test uses iterator types from std::filesystem // This test uses iterator types from std::filesystem
// XFAIL: availability-filesystem-missing // XFAIL: availability-filesystem-missing
// template<class I> // template<class I>
// concept __iterator_traits_detail::__cpp17_iterator; // concept __iterator_traits_detail::__cpp17_iterator;
#include "test_macros.h"
#include <iterator> #include <iterator>
#include <array> #include <array>
#include <deque> #include <deque>
#ifndef _LIBCPP_HAS_NO_FILESYSTEM_LIBRARY #ifndef TEST_HAS_NO_FILESYSTEM_LIBRARY
#include <filesystem> #include <filesystem>
#endif #endif
#include <forward_list> #include <forward_list>
#include <list> #include <list>
#include <map> #include <map>
#include <set> #include <set>
#include <string> #include <string>
#include <string_view> #include <string_view>
Show All 24 Lines
// <deque> // <deque>
static_assert(std::__iterator_traits_detail::__cpp17_iterator<std::deque<int>::iterator>); static_assert(std::__iterator_traits_detail::__cpp17_iterator<std::deque<int>::iterator>);
static_assert(std::__iterator_traits_detail::__cpp17_iterator<std::deque<int>::const_iterator>); static_assert(std::__iterator_traits_detail::__cpp17_iterator<std::deque<int>::const_iterator>);
static_assert(std::__iterator_traits_detail::__cpp17_iterator<std::deque<int>::reverse_iterator>); static_assert(std::__iterator_traits_detail::__cpp17_iterator<std::deque<int>::reverse_iterator>);
static_assert(std::__iterator_traits_detail::__cpp17_iterator<std::deque<int>::const_reverse_iterator>); static_assert(std::__iterator_traits_detail::__cpp17_iterator<std::deque<int>::const_reverse_iterator>);
// <filesystem> // <filesystem>
#ifndef _LIBCPP_HAS_NO_FILESYSTEM_LIBRARY #ifndef TEST_HAS_NO_FILESYSTEM_LIBRARY
static_assert(std::__iterator_traits_detail::__cpp17_iterator<std::filesystem::directory_iterator>); static_assert(std::__iterator_traits_detail::__cpp17_iterator<std::filesystem::directory_iterator>);
static_assert(std::__iterator_traits_detail::__cpp17_iterator<std::filesystem::recursive_directory_iterator>); static_assert(std::__iterator_traits_detail::__cpp17_iterator<std::filesystem::recursive_directory_iterator>);
#endif #endif
// <forward_list> // <forward_list>
static_assert(std::__iterator_traits_detail::__cpp17_iterator<std::forward_list<int>::iterator>); static_assert(std::__iterator_traits_detail::__cpp17_iterator<std::forward_list<int>::iterator>);
static_assert(std::__iterator_traits_detail::__cpp17_iterator<std::forward_list<int>::const_iterator>); static_assert(std::__iterator_traits_detail::__cpp17_iterator<std::forward_list<int>::const_iterator>);
▲ Show 20 Lines • Show All 92 Lines • Show Last 20 Lines

libcxx/test/libcxx/iterators/iterator.requirements/iterator.assoc.types/iterator.traits/legacy_random_access_iterator.compile.pass.cpp

//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
// //
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information. // See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
// UNSUPPORTED: c++03, c++11, c++14, c++17 // UNSUPPORTED: c++03, c++11, c++14, c++17
// This test uses iterator types from std::filesystem // This test uses iterator types from std::filesystem
// XFAIL: availability-filesystem-missing // XFAIL: availability-filesystem-missing
// template<class I> // template<class I>
// concept __iterator_traits_detail::__cpp17_random_access_iterator; // concept __iterator_traits_detail::__cpp17_random_access_iterator;
#include "test_macros.h"
#include <iterator> #include <iterator>
#include <array> #include <array>
#include <deque> #include <deque>
#ifndef _LIBCPP_HAS_NO_FILESYSTEM_LIBRARY #ifndef TEST_HAS_NO_FILESYSTEM_LIBRARY
#include <filesystem> #include <filesystem>
#endif #endif
#include <forward_list> #include <forward_list>
#include <list> #include <list>
#include <map> #include <map>
#include <set> #include <set>
#include <string> #include <string>
#include <string_view> #include <string_view>
Show All 24 Lines
// <deque> // <deque>
static_assert(std::__iterator_traits_detail::__cpp17_random_access_iterator<std::deque<int>::iterator>); static_assert(std::__iterator_traits_detail::__cpp17_random_access_iterator<std::deque<int>::iterator>);
static_assert(std::__iterator_traits_detail::__cpp17_random_access_iterator<std::deque<int>::const_iterator>); static_assert(std::__iterator_traits_detail::__cpp17_random_access_iterator<std::deque<int>::const_iterator>);
static_assert(std::__iterator_traits_detail::__cpp17_random_access_iterator<std::deque<int>::reverse_iterator>); static_assert(std::__iterator_traits_detail::__cpp17_random_access_iterator<std::deque<int>::reverse_iterator>);
static_assert(std::__iterator_traits_detail::__cpp17_random_access_iterator<std::deque<int>::const_reverse_iterator>); static_assert(std::__iterator_traits_detail::__cpp17_random_access_iterator<std::deque<int>::const_reverse_iterator>);
// <filesystem> // <filesystem>
#ifndef _LIBCPP_HAS_NO_FILESYSTEM_LIBRARY #ifndef TEST_HAS_NO_FILESYSTEM_LIBRARY
static_assert(!std::__iterator_traits_detail::__cpp17_random_access_iterator<std::filesystem::directory_iterator>); static_assert(!std::__iterator_traits_detail::__cpp17_random_access_iterator<std::filesystem::directory_iterator>);
static_assert(!std::__iterator_traits_detail::__cpp17_random_access_iterator<std::filesystem::recursive_directory_iterator>); static_assert(!std::__iterator_traits_detail::__cpp17_random_access_iterator<std::filesystem::recursive_directory_iterator>);
#endif #endif
// <forward_list> // <forward_list>
static_assert(!std::__iterator_traits_detail::__cpp17_random_access_iterator<std::forward_list<int>::iterator>); static_assert(!std::__iterator_traits_detail::__cpp17_random_access_iterator<std::forward_list<int>::iterator>);
static_assert(!std::__iterator_traits_detail::__cpp17_random_access_iterator<std::forward_list<int>::const_iterator>); static_assert(!std::__iterator_traits_detail::__cpp17_random_access_iterator<std::forward_list<int>::const_iterator>);
▲ Show 20 Lines • Show All 92 Lines • Show Last 20 Lines