maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Really comment out the constexpr tests. 

llvm-svn: 323072
This commit is contained in:
Marshall Clow 2018-01-22 01:51:49 +00:00
parent 785ae3e8c0
commit ac471d6db2
2 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
libcxx/test/std/algorithms/alg.sorting/alg.merge/merge.pass.cpp
View File

@ -26,20 +26,20 @@
#include "test_iterators.h"
#if TEST_STD_VER > 17
TEST_CONSTEXPR bool test_constexpr() {
int ia[] = {0, 1, 2, 3, 4};
int ib[] = {2, 4, 6, 8};
int ic[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
const int expected[] = {0, 1, 2, 2, 3, 4, 4, 6, 8};
auto it = std::merge(std::begin(ia), std::end(ia), std::begin(ib), std::end(ib), std::begin(ic));
return std::distance(std::begin(ic), it) == (std::size(ia) + std::size(ib))
&& *it == 0
&& std::equal(std::begin(ic), it, std::begin(expected), std::end(expected))
;
}
#endif
// #if TEST_STD_VER > 17
// TEST_CONSTEXPR bool test_constexpr() {
// int ia[] = {0, 1, 2, 3, 4};
// int ib[] = {2, 4, 6, 8};
// int ic[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
// const int expected[] = {0, 1, 2, 2, 3, 4, 4, 6, 8};
//
// auto it = std::merge(std::begin(ia), std::end(ia), std::begin(ib), std::end(ib), std::begin(ic));
// return std::distance(std::begin(ic), it) == (std::size(ia) + std::size(ib))
// && *it == 0
// && std::equal(std::begin(ic), it, std::begin(expected), std::end(expected))
// ;
// }
// #endif
std::mt19937 randomness;

32
libcxx/test/std/algorithms/alg.sorting/alg.merge/merge_comp.pass.cpp
View File

@ -29,22 +29,22 @@
#include "test_iterators.h"
#include "counting_predicates.hpp"
#if TEST_STD_VER > 17
TEST_CONSTEXPR bool test_constexpr() {
int ia[] = {0, 1, 2, 3, 4};
int ib[] = {2, 4, 6, 8};
int ic[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
const int expected[] = {0, 1, 2, 2, 3, 4, 4, 6, 8};
auto it = std::merge(std::begin(ia), std::end(ia),
std::begin(ib), std::end(ib),
std::begin(ic), [](int a, int b) {return a == b; });
return std::distance(std::begin(ic), it) == (std::size(ia) + std::size(ib))
&& *it == 0
&& std::equal(std::begin(ic), it, std::begin(expected), std::end(expected))
;
}
#endif
// #if TEST_STD_VER > 17
// TEST_CONSTEXPR bool test_constexpr() {
// int ia[] = {0, 1, 2, 3, 4};
// int ib[] = {2, 4, 6, 8};
// int ic[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
// const int expected[] = {0, 1, 2, 2, 3, 4, 4, 6, 8};
//
// auto it = std::merge(std::begin(ia), std::end(ia),
// std::begin(ib), std::end(ib),
// std::begin(ic), [](int a, int b) {return a == b; });
// return std::distance(std::begin(ic), it) == (std::size(ia) + std::size(ib))
// && *it == 0
// && std::equal(std::begin(ic), it, std::begin(expected), std::end(expected))
// ;
// }
// #endif
std::mt19937 randomness;