llvm/libcxx
1
0
Fork 0
mirror of https://github.com/llvm-mirror/libcxx.git synced 2025-10-23 10:07:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix portability issues in <random> tests. Patch from STL@microsoft.com

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@276585 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Eric Fiselier
2016-07-24 23:36:18 +00:00
parent 5eec7d6e30
commit aafdbda646
4 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
test/std/algorithms/alg.modifying.operations/alg.random.shuffle/random_shuffle.pass.cpp
View File

@@ -17,6 +17,8 @@
#include <algorithm> #include <algorithm>
#include <cassert> #include <cassert>
#include "test_macros.h"
int main() int main()
{ {
int ia[] = {1, 2, 3, 4}; int ia[] = {1, 2, 3, 4};
@@ -24,7 +26,9 @@ int main()
int ia2[] = {4, 1, 2, 3}; int ia2[] = {4, 1, 2, 3};
const unsigned sa = sizeof(ia)/sizeof(ia[0]); const unsigned sa = sizeof(ia)/sizeof(ia[0]);
std::random_shuffle(ia, ia+sa); std::random_shuffle(ia, ia+sa);
assert(std::equal(ia, ia+sa, ia1)); LIBCPP_ASSERT(std::equal(ia, ia+sa, ia1));
assert(std::is_permutation(ia, ia+sa, ia1));
std::random_shuffle(ia, ia+sa); std::random_shuffle(ia, ia+sa);
assert(std::equal(ia, ia+sa, ia2)); LIBCPP_ASSERT(std::equal(ia, ia+sa, ia2));
assert(std::is_permutation(ia, ia+sa, ia2));
} }

5
test/std/algorithms/alg.modifying.operations/alg.random.shuffle/random_shuffle_rand.pass.cpp
View File

@@ -18,6 +18,8 @@
#include <algorithm> #include <algorithm>
#include <cassert> #include <cassert>
#include "test_macros.h"
struct gen struct gen
{ {
int operator()(int n) int operator()(int n)
@@ -33,5 +35,6 @@ int main()
const unsigned sa = sizeof(ia)/sizeof(ia[0]); const unsigned sa = sizeof(ia)/sizeof(ia[0]);
gen r; gen r;
std::random_shuffle(ia, ia+sa, r); std::random_shuffle(ia, ia+sa, r);
assert(std::equal(ia, ia+sa, ia1)); LIBCPP_ASSERT(std::equal(ia, ia+sa, ia1));
assert(std::is_permutation(ia, ia+sa, ia1));
} }

8
test/std/algorithms/alg.modifying.operations/alg.random.shuffle/random_shuffle_urng.pass.cpp
View File

@@ -17,6 +17,8 @@
#include <random> #include <random>
#include <cassert> #include <cassert>
#include "test_macros.h"
int main() int main()
{ {
int ia[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10}; int ia[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10};
@@ -25,7 +27,9 @@ int main()
const unsigned sa = sizeof(ia)/sizeof(ia[0]); const unsigned sa = sizeof(ia)/sizeof(ia[0]);
std::minstd_rand g; std::minstd_rand g;
std::shuffle(ia, ia+sa, g); std::shuffle(ia, ia+sa, g);
assert(std::equal(ia, ia+sa, ia1)); LIBCPP_ASSERT(std::equal(ia, ia+sa, ia1));
assert(std::is_permutation(ia, ia+sa, ia1));
std::shuffle(ia, ia+sa, g); std::shuffle(ia, ia+sa, g);
assert(std::equal(ia, ia+sa, ia2)); LIBCPP_ASSERT(std::equal(ia, ia+sa, ia2));
assert(std::is_permutation(ia, ia+sa, ia2));
} }

4
test/std/numerics/rand/rand.predef/default_random_engine.pass.cpp
View File

@@ -14,9 +14,11 @@
#include <random> #include <random>
#include <cassert> #include <cassert>
#include "test_macros.h"
int main() int main()
{ {
std::default_random_engine e; std::default_random_engine e;
e.discard(9999); e.discard(9999);
assert(e() == 399268537u); LIBCPP_ASSERT(e() == 399268537u);
} }