[libc++][chrono] TZDB CI fixes.

Fixes a conflict with adding the no experimental module build.

Disables some tests that need further investigation, this should fix the
CI runners.

These issues were reported on Discord and in D154282.
This commit is contained in:
Mark de Wever 2023-09-07 20:29:57 +02:00
parent ab0eb59f1c
commit 88359213ee
7 changed files with 25 additions and 5 deletions

View File

@ -193,6 +193,7 @@ export namespace std {
#if !defined(_LIBCPP_HAS_NO_TIME_ZONE_DATABASE) && !defined(_LIBCPP_HAS_NO_FILESYSTEM) && \ #if !defined(_LIBCPP_HAS_NO_TIME_ZONE_DATABASE) && !defined(_LIBCPP_HAS_NO_FILESYSTEM) && \
!defined(_LIBCPP_HAS_NO_LOCALIZATION) !defined(_LIBCPP_HAS_NO_LOCALIZATION)
# ifdef _LIBCPP_ENABLE_EXPERIMENTAL
// [time.zone.db], time zone database // [time.zone.db], time zone database
using std::chrono::tzdb; using std::chrono::tzdb;
using std::chrono::tzdb_list; using std::chrono::tzdb_list;
@ -207,10 +208,10 @@ export namespace std {
using std::chrono::reload_tzdb; using std::chrono::reload_tzdb;
using std::chrono::remote_version; using std::chrono::remote_version;
#endif // !defined(_LIBCPP_HAS_NO_TIME_ZONE_DATABASE) && !defined(_LIBCPP_HAS_NO_FILESYSTEM) && # endif // !defined(_LIBCPP_HAS_NO_TIME_ZONE_DATABASE) && !defined(_LIBCPP_HAS_NO_FILESYSTEM) &&
// !defined(_LIBCPP_HAS_NO_LOCALIZATION) // !defined(_LIBCPP_HAS_NO_LOCALIZATION)
#if 0 # if 0
// [time.zone.exception], exception classes // [time.zone.exception], exception classes
using std::chrono::ambiguous_local_time; using std::chrono::ambiguous_local_time;
using std::chrono::nonexistent_local_time; using std::chrono::nonexistent_local_time;
@ -238,8 +239,9 @@ export namespace std {
// [time.format], formatting // [time.format], formatting
using std::chrono::local_time_format; using std::chrono::local_time_format;
#endif # endif
} // namespace chrono #endif // _LIBCPP_ENABLE_EXPERIMENTAL
} // namespace chrono
#ifndef _LIBCPP_HAS_NO_LOCALIZATION #ifndef _LIBCPP_HAS_NO_LOCALIZATION
using std::formatter; using std::formatter;

View File

@ -12,6 +12,9 @@
// XFAIL: libcpp-has-no-incomplete-tzdb // XFAIL: libcpp-has-no-incomplete-tzdb
// XFAIL: availability-tzdb-missing // XFAIL: availability-tzdb-missing
// TODO TZDB Enable tests
// UNSUPPORTED: c++20, c++23, c++26
// <chrono> // <chrono>
// const tzdb& get_tzdb(); // const tzdb& get_tzdb();

View File

@ -12,6 +12,9 @@
// XFAIL: libcpp-has-no-incomplete-tzdb // XFAIL: libcpp-has-no-incomplete-tzdb
// XFAIL: availability-tzdb-missing // XFAIL: availability-tzdb-missing
// TODO TZDB Enable tests
// UNSUPPORTED: c++20, c++23, c++26
// <chrono> // <chrono>
// const tzdb& get_tzdb_list(); // const tzdb& get_tzdb_list();

View File

@ -12,6 +12,9 @@
// XFAIL: libcpp-has-no-incomplete-tzdb // XFAIL: libcpp-has-no-incomplete-tzdb
// XFAIL: availability-tzdb-missing // XFAIL: availability-tzdb-missing
// TODO TZDB Enable tests
// UNSUPPORTED: c++20, c++23, c++26
// <chrono> // <chrono>
// //
// class tzdb_list; // class tzdb_list;

View File

@ -12,6 +12,9 @@
// XFAIL: libcpp-has-no-incomplete-tzdb // XFAIL: libcpp-has-no-incomplete-tzdb
// XFAIL: availability-tzdb-missing // XFAIL: availability-tzdb-missing
// TODO TZDB Enable tests
// UNSUPPORTED: c++20, c++23, c++26
// <chrono> // <chrono>
// //
// class tzdb_list; // class tzdb_list;

View File

@ -12,6 +12,9 @@
// XFAIL: libcpp-has-no-incomplete-tzdb // XFAIL: libcpp-has-no-incomplete-tzdb
// XFAIL: availability-tzdb-missing // XFAIL: availability-tzdb-missing
// TODO TZDB Enable tests
// UNSUPPORTED: c++20, c++23, c++26
// <chrono> // <chrono>
// Note there is no Standard way to change the remote database used. // Note there is no Standard way to change the remote database used.

View File

@ -12,6 +12,9 @@
// XFAIL: libcpp-has-no-incomplete-tzdb // XFAIL: libcpp-has-no-incomplete-tzdb
// XFAIL: availability-tzdb-missing // XFAIL: availability-tzdb-missing
// TODO TZDB Enable tests
// UNSUPPORTED: c++20, c++23, c++26
// <chrono> // <chrono>
// const string remote_version(); // const string remote_version();