Address @mordante's review comments

frederick-vs-ja · frederick-vs-ja · commit 0c03d72dd7a5 · 2025-03-17T00:10:46.000+08:00
- Uses a simpler RNG.
- Improves comments.
diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.merge/inplace_merge.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.merge/inplace_merge.pass.cpp
@@ -96,20 +96,14 @@ TEST_CONSTEXPR_CXX26 void test(RandSrc& randomness) {
   test_one<Iter>(3, 2, randomness);
   test_one<Iter>(3, 3, randomness);
   test<Iter>(4, randomness);
-  test<Iter>(50, randomness);
-#if defined(_LIBCPP_HARDENING_MODE)
-  if (!TEST_IS_CONSTANT_EVALUATED) // avoid blowing past constant evaluation limit
-#endif
-  {
-    test<Iter>(100, randomness);
-  }
-  if (!TEST_IS_CONSTANT_EVALUATED) { // avoid blowing past constant evaluation limit
+  test<Iter>(100, randomness);
+  if (!TEST_IS_CONSTANT_EVALUATED) { // avoid exceeding the constant evaluation step limit
     test<Iter>(1000, randomness);
   }
 }
 
 TEST_CONSTEXPR_CXX26 bool test() {
-  support::minstd_rand randomness;
+  support::simple_random_generator randomness;
 
   test<bidirectional_iterator<int*> >(randomness);
   test<random_access_iterator<int*> >(randomness);
diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.merge/inplace_merge_comp.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.merge/inplace_merge_comp.pass.cpp
@@ -115,12 +115,12 @@ TEST_CONSTEXPR_CXX26 void test(RandSrc& randomness) {
   test<Iter>(20, randomness);
   test<Iter>(50, randomness);
 #if defined(_LIBCPP_HARDENING_MODE)
-  if (!TEST_IS_CONSTANT_EVALUATED) // avoid blowing past constant evaluation limit
+  if (!TEST_IS_CONSTANT_EVALUATED) // avoid exceeding the constant evaluation step limit
 #endif
   {
     test<Iter>(100, randomness);
   }
-  if (!TEST_IS_CONSTANT_EVALUATED) { // avoid blowing past constant evaluation limit
+  if (!TEST_IS_CONSTANT_EVALUATED) { // avoid exceeding the constant evaluation step limit
     test<Iter>(1000, randomness);
   }
 }
@@ -145,7 +145,7 @@ TEST_CONSTEXPR_CXX26 void test_PR31166() {
 }
 
 TEST_CONSTEXPR_CXX26 bool test() {
-  support::minstd_rand randomness;
+  support::simple_random_generator randomness;
 
   test<bidirectional_iterator<int*> >(randomness);
   test<random_access_iterator<int*> >(randomness);
diff --git a/libcxx/test/support/constexpr_random.h b/libcxx/test/support/constexpr_random.h

Original file line number	Diff line number	Diff line change
`@@ -115,12 +115,12 @@ TEST_CONSTEXPR_CXX26 void test(RandSrc& randomness) {`
`115`	`115`	`test<Iter>(20, randomness);`
`116`	`116`	`test<Iter>(50, randomness);`
`117`	`117`	`#if defined(_LIBCPP_HARDENING_MODE)`
`118`		`- if (!TEST_IS_CONSTANT_EVALUATED) // avoid blowing past constant evaluation limit`
	`118`	`+ if (!TEST_IS_CONSTANT_EVALUATED) // avoid exceeding the constant evaluation step limit`
`119`	`119`	`#endif`
`120`	`120`	`{`
`121`	`121`	`test<Iter>(100, randomness);`
`122`	`122`	`}`
`123`		`- if (!TEST_IS_CONSTANT_EVALUATED) { // avoid blowing past constant evaluation limit`
	`123`	`+ if (!TEST_IS_CONSTANT_EVALUATED) { // avoid exceeding the constant evaluation step limit`
`124`	`124`	`test<Iter>(1000, randomness);`
`125`	`125`	`}`
`126`	`126`	`}`
`@@ -145,7 +145,7 @@ TEST_CONSTEXPR_CXX26 void test_PR31166() {`
`145`	`145`	`}`
`146`	`146`
`147`	`147`	`TEST_CONSTEXPR_CXX26 bool test() {`
`148`		`- support::minstd_rand randomness;`
	`148`	`+ support::simple_random_generator randomness;`
`149`	`149`
`150`	`150`	`test<bidirectional_iterator<int*> >(randomness);`
`151`	`151`	`test<random_access_iterator<int*> >(randomness);`