Skip to content

[libc++][test] Small fixes for time tests #132532

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 22, 2025
Merged

[libc++][test] Small fixes for time tests #132532

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ca6e225
Fix copy-paste damage in formatter.tai_time.pass.cpp.
StephanTLavavej Mar 22, 2025
15c4baf
Mark `is_steady` as `[[maybe_unused]]`.
StephanTLavavej Mar 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions libcxx/test/std/time/time.clock/time.clock.gps/types.compile.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@
#include "test_macros.h"

// class gps_clock
using rep = std::chrono::gps_clock::rep;
using period = std::chrono::gps_clock::period;
using duration = std::chrono::gps_clock::duration;
using time_point = std::chrono::gps_clock::time_point;
constexpr bool is_steady = std::chrono::gps_clock::is_steady;
using rep = std::chrono::gps_clock::rep;
using period = std::chrono::gps_clock::period;
using duration = std::chrono::gps_clock::duration;
using time_point = std::chrono::gps_clock::time_point;
[[maybe_unused]] constexpr bool is_steady = std::chrono::gps_clock::is_steady;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As the is_steady is tested only once (ditto tai_clock::is_steady) and doesn't seem necessary for twice, should we just remove it and write LIBCPP_STATIC_ASSERT(std::chrono::gps_clock::is_steady == false); instead?
CC @mordante.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note that time.clock.utc/types.compile.pass.cpp is also affected. (I missed gps and tai in my previous #131787.)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree it's cleaner, but there are indeed more clocks affected. I've created #132546 to look into this.


// Tests the values. part of them are implementation defined.
LIBCPP_STATIC_ASSERT(std::same_as<rep, std::chrono::utc_clock::rep>);
Expand Down
10 changes: 5 additions & 5 deletions libcxx/test/std/time/time.clock/time.clock.tai/types.compile.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@
#include "test_macros.h"

// class tai_clock
using rep = std::chrono::tai_clock::rep;
using period = std::chrono::tai_clock::period;
using duration = std::chrono::tai_clock::duration;
using time_point = std::chrono::tai_clock::time_point;
constexpr bool is_steady = std::chrono::tai_clock::is_steady;
using rep = std::chrono::tai_clock::rep;
using period = std::chrono::tai_clock::period;
using duration = std::chrono::tai_clock::duration;
using time_point = std::chrono::tai_clock::time_point;
[[maybe_unused]] constexpr bool is_steady = std::chrono::tai_clock::is_steady;

// Tests the values. part of them are implementation defined.
LIBCPP_STATIC_ASSERT(std::same_as<rep, std::chrono::utc_clock::rep>);
Expand Down
3 changes: 0 additions & 3 deletions libcxx/test/std/time/time.syn/formatter.tai_time.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,9 +268,6 @@ static void test_valid_values_day() {
lfmt,
cr::tai_seconds(1'613'259'090s)); // 23:31:30 TAI Friday, 13 February 2009

// Use the global locale (fr_FR)
check(SV("%d='01'\t%Od='01'\t%e=' 1'\t%Oe=' 1'\n"),
lfmt,
#else // defined(_WIN32) || defined(__APPLE__) || defined(_AIX) || defined(__FreeBSD__)
check(loc,
SV("%d='01'\t%Od='一'\t%e=' 1'\t%Oe='一'\n"),
Expand Down