Clean up a bunch of warnings in the tests, 3 of which actually turned out to be test bugs.

llvm-svn: 131479

29 files changed, 54 insertions, 4 deletions

diff --git a/libcxx/test/thread/futures/futures.overview/launch.pass.cpp b/libcxx/test/thread/futures/futures.overview/launch.pass.cpp
index 63eebe9f2d7..f4c4ca11c7f 100644
--- a/libcxx/test/thread/futures/futures.overview/launch.pass.cpp
+++ b/libcxx/test/thread/futures/futures.overview/launch.pass.cpp
@@ -20,7 +20,7 @@
 
 int main()
 {
-    static_assert(std::launch::any == std::launch::async | std::launch::deferred, "");
+    static_assert(std::launch::any == (std::launch::async | std::launch::deferred), "");
     static_assert(std::launch::async == 1, "");
     static_assert(std::launch::deferred == 2, "");
 }
diff --git a/libcxx/test/thread/futures/futures.tas/futures.task.members/ctor_func.pass.cpp b/libcxx/test/thread/futures/futures.tas/futures.task.members/ctor_func.pass.cpp
index 8ae59216316..7009f306d2a 100644
--- a/libcxx/test/thread/futures/futures.tas/futures.task.members/ctor_func.pass.cpp
+++ b/libcxx/test/thread/futures/futures.tas/futures.task.members/ctor_func.pass.cpp
@@ -46,7 +46,7 @@ int main()
         assert(A::n_copies == 0);
         assert(A::n_moves > 0);
     }
-    A::n_copies == 0;
+    A::n_copies = 0;
     A::n_copies = 0;
     {
         A a(5);
diff --git a/libcxx/test/thread/futures/futures.tas/futures.task.members/ctor_func_alloc.pass.cpp b/libcxx/test/thread/futures/futures.tas/futures.task.members/ctor_func_alloc.pass.cpp
index 63042e8c5f8..2e0cf5d723e 100644
--- a/libcxx/test/thread/futures/futures.tas/futures.task.members/ctor_func_alloc.pass.cpp
+++ b/libcxx/test/thread/futures/futures.tas/futures.task.members/ctor_func_alloc.pass.cpp
@@ -51,7 +51,7 @@ int main()
         assert(A::n_moves > 0);
     }
     assert(test_alloc_base::count == 0);
-    A::n_copies == 0;
+    A::n_copies = 0;
     A::n_copies = 0;
     {
         A a(5);
diff --git a/libcxx/test/utilities/template.bitset/bitset.cons/char_ptr_ctor.pass.cpp b/libcxx/test/utilities/template.bitset/bitset.cons/char_ptr_ctor.pass.cpp
index 247e15c74aa..7fe78bad1cc 100644
--- a/libcxx/test/utilities/template.bitset/bitset.cons/char_ptr_ctor.pass.cpp
+++ b/libcxx/test/utilities/template.bitset/bitset.cons/char_ptr_ctor.pass.cpp
@@ -15,6 +15,8 @@
 #include <bitset>
 #include <cassert>
 
+#pragma clang diagnostic ignored "-Wtautological-compare"
+
 template <std::size_t N>
 void test_char_pointer_ctor()
 {
diff --git a/libcxx/test/utilities/template.bitset/bitset.cons/default.pass.cpp b/libcxx/test/utilities/template.bitset/bitset.cons/default.pass.cpp
index 400bc3d387c..5d743c6bb63 100644
--- a/libcxx/test/utilities/template.bitset/bitset.cons/default.pass.cpp
+++ b/libcxx/test/utilities/template.bitset/bitset.cons/default.pass.cpp
@@ -12,6 +12,8 @@
 #include <bitset>
 #include <cassert>
 
+#pragma clang diagnostic ignored "-Wtautological-compare"
+
 template <std::size_t N>
 void test_default_ctor()
 {
diff --git a/libcxx/test/utilities/template.bitset/bitset.cons/string_ctor.pass.cpp b/libcxx/test/utilities/template.bitset/bitset.cons/string_ctor.pass.cpp
index 9a7de39f86c..bcee50c4c63 100644
--- a/libcxx/test/utilities/template.bitset/bitset.cons/string_ctor.pass.cpp
+++ b/libcxx/test/utilities/template.bitset/bitset.cons/string_ctor.pass.cpp
@@ -12,6 +12,8 @@
 #include <bitset>
 #include <cassert>
 
+#pragma clang diagnostic ignored "-Wtautological-compare"
+
 template <std::size_t N>
 void test_string_ctor()
 {
diff --git a/libcxx/test/utilities/template.bitset/bitset.cons/ull_ctor.pass.cpp b/libcxx/test/utilities/template.bitset/bitset.cons/ull_ctor.pass.cpp
index 5f4a7634444..c849937dae5 100644
--- a/libcxx/test/utilities/template.bitset/bitset.cons/ull_ctor.pass.cpp
+++ b/libcxx/test/utilities/template.bitset/bitset.cons/ull_ctor.pass.cpp
@@ -12,6 +12,8 @@
 #include <bitset>
 #include <cassert>
 
+#pragma clang diagnostic ignored "-Wtautological-compare"
+
 template <std::size_t N>
 void test_val_ctor()
 {
diff --git a/libcxx/test/utilities/template.bitset/bitset.members/count.pass.cpp b/libcxx/test/utilities/template.bitset/bitset.members/count.pass.cpp
index 1781e9b7579..fb9ce642299 100644
--- a/libcxx/test/utilities/template.bitset/bitset.members/count.pass.cpp
+++ b/libcxx/test/utilities/template.bitset/bitset.members/count.pass.cpp
@@ -13,6 +13,8 @@
 #include <cstdlib>
 #include <cassert>
 
+#pragma clang diagnostic ignored "-Wtautological-compare"
+
 template <std::size_t N>
 std::bitset<N>
 make_bitset()
diff --git a/libcxx/test/utilities/template.bitset/bitset.members/flip_all.pass.cpp b/libcxx/test/utilities/template.bitset/bitset.members/flip_all.pass.cpp
index 950a06a6355..6c4f5c69985 100644
--- a/libcxx/test/utilities/template.bitset/bitset.members/flip_all.pass.cpp
+++ b/libcxx/test/utilities/template.bitset/bitset.members/flip_all.pass.cpp
@@ -13,6 +13,8 @@
 #include <cstdlib>
 #include <cassert>
 
+#pragma clang diagnostic ignored "-Wtautological-compare"
+
 template <std::size_t N>
 std::bitset<N>
 make_bitset()
diff --git a/libcxx/test/utilities/template.bitset/bitset.members/flip_one.pass.cpp b/libcxx/test/utilities/template.bitset/bitset.members/flip_one.pass.cpp
index 7889dc76001..3e09b202097 100644
--- a/libcxx/test/utilities/template.bitset/bitset.members/flip_one.pass.cpp
+++ b/libcxx/test/utilities/template.bitset/bitset.members/flip_one.pass.cpp
@@ -13,6 +13,8 @@
 #include <cstdlib>
 #include <cassert>
 
+#pragma clang diagnostic ignored "-Wtautological-compare"
+
 template <std::size_t N>
 std::bitset<N>
 make_bitset()
diff --git a/libcxx/test/utilities/template.bitset/bitset.members/index.pass.cpp b/libcxx/test/utilities/template.bitset/bitset.members/index.pass.cpp
index cc0e0fdc480..b96aaa51ab8 100644
--- a/libcxx/test/utilities/template.bitset/bitset.members/index.pass.cpp
+++ b/libcxx/test/utilities/template.bitset/bitset.members/index.pass.cpp
@@ -13,6 +13,8 @@
 #include <cstdlib>
 #include <cassert>
 
+#pragma clang diagnostic ignored "-Wtautological-compare"
+
 template <std::size_t N>
 std::bitset<N>
 make_bitset()
diff --git a/libcxx/test/utilities/template.bitset/bitset.members/index_const.pass.cpp b/libcxx/test/utilities/template.bitset/bitset.members/index_const.pass.cpp
index c0bb471323d..e3c28c69357 100644
--- a/libcxx/test/utilities/template.bitset/bitset.members/index_const.pass.cpp
+++ b/libcxx/test/utilities/template.bitset/bitset.members/index_const.pass.cpp
@@ -13,6 +13,8 @@
 #include <cstdlib>
 #include <cassert>
 
+#pragma clang diagnostic ignored "-Wtautological-compare"
+
 template <std::size_t N>
 std::bitset<N>
 make_bitset()
diff --git a/libcxx/test/utilities/template.bitset/bitset.members/left_shift.pass.cpp b/libcxx/test/utilities/template.bitset/bitset.members/left_shift.pass.cpp
index 356226019cb..7fe9fa72e92 100644
--- a/libcxx/test/utilities/template.bitset/bitset.members/left_shift.pass.cpp
+++ b/libcxx/test/utilities/template.bitset/bitset.members/left_shift.pass.cpp
@@ -13,6 +13,8 @@
 #include <cstdlib>
 #include <cassert>
 
+#pragma clang diagnostic ignored "-Wtautological-compare"
+
 template <std::size_t N>
 std::bitset<N>
 make_bitset()
diff --git a/libcxx/test/utilities/template.bitset/bitset.members/left_shift_eq.pass.cpp b/libcxx/test/utilities/template.bitset/bitset.members/left_shift_eq.pass.cpp
index ddda8bea10c..bed3e28ece8 100644
--- a/libcxx/test/utilities/template.bitset/bitset.members/left_shift_eq.pass.cpp
+++ b/libcxx/test/utilities/template.bitset/bitset.members/left_shift_eq.pass.cpp
@@ -13,6 +13,8 @@
 #include <cstdlib>
 #include <cassert>
 
+#pragma clang diagnostic ignored "-Wtautological-compare"
+
 template <std::size_t N>
 std::bitset<N>
 make_bitset()
diff --git a/libcxx/test/utilities/template.bitset/bitset.members/not_all.pass.cpp b/libcxx/test/utilities/template.bitset/bitset.members/not_all.pass.cpp
index 026ed560673..2f8f7111f5a 100644
--- a/libcxx/test/utilities/template.bitset/bitset.members/not_all.pass.cpp
+++ b/libcxx/test/utilities/template.bitset/bitset.members/not_all.pass.cpp
@@ -13,6 +13,8 @@
 #include <cstdlib>
 #include <cassert>
 
+#pragma clang diagnostic ignored "-Wtautological-compare"
+
 template <std::size_t N>
 std::bitset<N>
 make_bitset()
diff --git a/libcxx/test/utilities/template.bitset/bitset.members/op_and_eq.pass.cpp b/libcxx/test/utilities/template.bitset/bitset.members/op_and_eq.pass.cpp
index 6ef865b7c2d..b599ec398b3 100644
--- a/libcxx/test/utilities/template.bitset/bitset.members/op_and_eq.pass.cpp
+++ b/libcxx/test/utilities/template.bitset/bitset.members/op_and_eq.pass.cpp
@@ -13,6 +13,8 @@
 #include <cstdlib>
 #include <cassert>
 
+#pragma clang diagnostic ignored "-Wtautological-compare"
+
 template <std::size_t N>
 std::bitset<N>
 make_bitset()
diff --git a/libcxx/test/utilities/template.bitset/bitset.members/op_eq_eq.pass.cpp b/libcxx/test/utilities/template.bitset/bitset.members/op_eq_eq.pass.cpp
index c009da46b35..5f6cf3d0a30 100644
--- a/libcxx/test/utilities/template.bitset/bitset.members/op_eq_eq.pass.cpp
+++ b/libcxx/test/utilities/template.bitset/bitset.members/op_eq_eq.pass.cpp
@@ -16,6 +16,8 @@
 #include <cstdlib>
 #include <cassert>
 
+#pragma clang diagnostic ignored "-Wtautological-compare"
+
 template <std::size_t N>
 std::bitset<N>
 make_bitset()
diff --git a/libcxx/test/utilities/template.bitset/bitset.members/op_or_eq.pass.cpp b/libcxx/test/utilities/template.bitset/bitset.members/op_or_eq.pass.cpp
index c5c946c46a5..6e63879890a 100644
--- a/libcxx/test/utilities/template.bitset/bitset.members/op_or_eq.pass.cpp
+++ b/libcxx/test/utilities/template.bitset/bitset.members/op_or_eq.pass.cpp
@@ -13,6 +13,8 @@
 #include <cstdlib>
 #include <cassert>
 
+#pragma clang diagnostic ignored "-Wtautological-compare"
+
 template <std::size_t N>
 std::bitset<N>
 make_bitset()
diff --git a/libcxx/test/utilities/template.bitset/bitset.members/op_xor_eq.pass.cpp b/libcxx/test/utilities/template.bitset/bitset.members/op_xor_eq.pass.cpp
index d1b920a5aa1..e68a641cadc 100644
--- a/libcxx/test/utilities/template.bitset/bitset.members/op_xor_eq.pass.cpp
+++ b/libcxx/test/utilities/template.bitset/bitset.members/op_xor_eq.pass.cpp
@@ -13,6 +13,8 @@
 #include <cstdlib>
 #include <cassert>
 
+#pragma clang diagnostic ignored "-Wtautological-compare"
+
 template <std::size_t N>
 std::bitset<N>
 make_bitset()
diff --git a/libcxx/test/utilities/template.bitset/bitset.members/reset_all.pass.cpp b/libcxx/test/utilities/template.bitset/bitset.members/reset_all.pass.cpp
index 611b111f00c..ee44d92c43b 100644
--- a/libcxx/test/utilities/template.bitset/bitset.members/reset_all.pass.cpp
+++ b/libcxx/test/utilities/template.bitset/bitset.members/reset_all.pass.cpp
@@ -12,6 +12,8 @@
 #include <bitset>
 #include <cassert>
 
+#pragma clang diagnostic ignored "-Wtautological-compare"
+
 template <std::size_t N>
 void test_reset_all()
 {
diff --git a/libcxx/test/utilities/template.bitset/bitset.members/right_shift.pass.cpp b/libcxx/test/utilities/template.bitset/bitset.members/right_shift.pass.cpp
index 315a7bff2da..87fcc281fa2 100644
--- a/libcxx/test/utilities/template.bitset/bitset.members/right_shift.pass.cpp
+++ b/libcxx/test/utilities/template.bitset/bitset.members/right_shift.pass.cpp
@@ -13,6 +13,8 @@
 #include <cstdlib>
 #include <cassert>
 
+#pragma clang diagnostic ignored "-Wtautological-compare"
+
 template <std::size_t N>
 std::bitset<N>
 make_bitset()
diff --git a/libcxx/test/utilities/template.bitset/bitset.members/right_shift_eq.pass.cpp b/libcxx/test/utilities/template.bitset/bitset.members/right_shift_eq.pass.cpp
index c04b7591a0a..1dd89c1844b 100644
--- a/libcxx/test/utilities/template.bitset/bitset.members/right_shift_eq.pass.cpp
+++ b/libcxx/test/utilities/template.bitset/bitset.members/right_shift_eq.pass.cpp
@@ -13,6 +13,8 @@
 #include <cstdlib>
 #include <cassert>
 
+#pragma clang diagnostic ignored "-Wtautological-compare"
+
 template <std::size_t N>
 std::bitset<N>
 make_bitset()
diff --git a/libcxx/test/utilities/template.bitset/bitset.members/set_all.pass.cpp b/libcxx/test/utilities/template.bitset/bitset.members/set_all.pass.cpp
index 007c7c08fac..56454a84f11 100644
--- a/libcxx/test/utilities/template.bitset/bitset.members/set_all.pass.cpp
+++ b/libcxx/test/utilities/template.bitset/bitset.members/set_all.pass.cpp
@@ -12,6 +12,8 @@
 #include <bitset>
 #include <cassert>
 
+#pragma clang diagnostic ignored "-Wtautological-compare"
+
 template <std::size_t N>
 void test_set_all()
 {
diff --git a/libcxx/test/utilities/template.bitset/bitset.members/test.pass.cpp b/libcxx/test/utilities/template.bitset/bitset.members/test.pass.cpp
index 2620c2da57a..5102b46171a 100644
--- a/libcxx/test/utilities/template.bitset/bitset.members/test.pass.cpp
+++ b/libcxx/test/utilities/template.bitset/bitset.members/test.pass.cpp
@@ -13,6 +13,8 @@
 #include <cstdlib>
 #include <cassert>
 
+#pragma clang diagnostic ignored "-Wtautological-compare"
+
 template <std::size_t N>
 std::bitset<N>
 make_bitset()
diff --git a/libcxx/test/utilities/template.bitset/bitset.members/to_string.pass.cpp b/libcxx/test/utilities/template.bitset/bitset.members/to_string.pass.cpp
index a4fc38bd1bb..b6579409747 100644
--- a/libcxx/test/utilities/template.bitset/bitset.members/to_string.pass.cpp
+++ b/libcxx/test/utilities/template.bitset/bitset.members/to_string.pass.cpp
@@ -26,6 +26,8 @@
 #include <cstdlib>
 #include <cassert>
 
+#pragma clang diagnostic ignored "-Wtautological-compare"
+
 template <std::size_t N>
 std::bitset<N>
 make_bitset()
diff --git a/libcxx/test/utilities/template.bitset/bitset.operators/op_and.pass.cpp b/libcxx/test/utilities/template.bitset/bitset.operators/op_and.pass.cpp
index 73f0f2aeae2..751cee69102 100644
--- a/libcxx/test/utilities/template.bitset/bitset.operators/op_and.pass.cpp
+++ b/libcxx/test/utilities/template.bitset/bitset.operators/op_and.pass.cpp
@@ -13,6 +13,8 @@
 #include <cstdlib>
 #include <cassert>
 
+#pragma clang diagnostic ignored "-Wtautological-compare"
+
 template <std::size_t N>
 std::bitset<N>
 make_bitset()
diff --git a/libcxx/test/utilities/template.bitset/bitset.operators/op_not.pass.cpp b/libcxx/test/utilities/template.bitset/bitset.operators/op_not.pass.cpp
index 3e6133d6a97..fda5e5cda8e 100644
--- a/libcxx/test/utilities/template.bitset/bitset.operators/op_not.pass.cpp
+++ b/libcxx/test/utilities/template.bitset/bitset.operators/op_not.pass.cpp
@@ -13,6 +13,8 @@
 #include <cstdlib>
 #include <cassert>
 
+#pragma clang diagnostic ignored "-Wtautological-compare"
+
 template <std::size_t N>
 std::bitset<N>
 make_bitset()
diff --git a/libcxx/test/utilities/template.bitset/bitset.operators/op_or.pass.cpp b/libcxx/test/utilities/template.bitset/bitset.operators/op_or.pass.cpp
index 09d170c6700..067f868215b 100644
--- a/libcxx/test/utilities/template.bitset/bitset.operators/op_or.pass.cpp
+++ b/libcxx/test/utilities/template.bitset/bitset.operators/op_or.pass.cpp
@@ -13,6 +13,8 @@
 #include <cstdlib>
 #include <cassert>
 
+#pragma clang diagnostic ignored "-Wtautological-compare"
+
 template <std::size_t N>
 std::bitset<N>
 make_bitset()
diff --git a/libcxx/test/utilities/utility/forward/move_only.pass.cpp b/libcxx/test/utilities/utility/forward/move_only.pass.cpp
index 2eb023d4ada..0588c110f1d 100644
--- a/libcxx/test/utilities/utility/forward/move_only.pass.cpp
+++ b/libcxx/test/utilities/utility/forward/move_only.pass.cpp
@@ -26,7 +26,7 @@ public:
 
 #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
     move_only(move_only&&) {}
-    move_only& operator=(move_only&&) {}
+    move_only& operator=(move_only&&) {return *this;}
 #else  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
     operator std::__rv<move_only> () {return std::__rv<move_only>(*this);}
     move_only(std::__rv<move_only>) {}