[libc++][test] Small fixes for time tests #132532
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Comparing the `#if` to the `#else` case, it's clear that this half-copied check should be removed.
It's only used within `LIBCPP_STATIC_ASSERT`.
llvmbot
added
the
libc++
|
@llvm/pr-subscribers-libcxx Author: Stephan T. Lavavej (StephanTLavavej) Changes
Full diff: https://github.com/llvm/llvm-project/pull/132532.diff 3 Files Affected:
diff --git a/libcxx/test/std/time/time.clock/time.clock.gps/types.compile.pass.cpp b/libcxx/test/std/time/time.clock/time.clock.gps/types.compile.pass.cpp
index af95c5fe73402..006ad9a2d243e 100644
--- a/libcxx/test/std/time/time.clock/time.clock.gps/types.compile.pass.cpp
+++ b/libcxx/test/std/time/time.clock/time.clock.gps/types.compile.pass.cpp
@@ -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;
// Tests the values. part of them are implementation defined.
LIBCPP_STATIC_ASSERT(std::same_as<rep, std::chrono::utc_clock::rep>);
diff --git a/libcxx/test/std/time/time.clock/time.clock.tai/types.compile.pass.cpp b/libcxx/test/std/time/time.clock/time.clock.tai/types.compile.pass.cpp
index ddb057333f49a..a7123bc3e0b5c 100644
--- a/libcxx/test/std/time/time.clock/time.clock.tai/types.compile.pass.cpp
+++ b/libcxx/test/std/time/time.clock/time.clock.tai/types.compile.pass.cpp
@@ -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>);
diff --git a/libcxx/test/std/time/time.syn/formatter.tai_time.pass.cpp b/libcxx/test/std/time/time.syn/formatter.tai_time.pass.cpp
index 7ca088cc6e8f4..6a1d5bde44d35 100644
--- a/libcxx/test/std/time/time.syn/formatter.tai_time.pass.cpp
+++ b/libcxx/test/std/time/time.syn/formatter.tai_time.pass.cpp
@@ -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"),
|
| 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; |
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
Note that time.clock.utc/types.compile.pass.cpp is also affected. (I missed gps and tai in my previous #131787.)
There was a problem hiding this comment.
I agree it's cleaner, but there are indeed more clocks affected. I've created #132546 to look into this.
mordante
approved these changes
Mar 22, 2025
| 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; |
There was a problem hiding this comment.
I agree it's cleaner, but there are indeed more clocks affected. I've created #132546 to look into this.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
formatter.tai_time.pass.cpp.#ifto the#elsecase, it's clear that this half-copied check should be removed.is_steadyas[[maybe_unused]].LIBCPP_STATIC_ASSERT.