Move test into test/std subdirectory.

llvm-svn: 224658

64 files changed, 0 insertions, 2925 deletions

diff --git a/libcxx/test/numerics/numarray/template.valarray/types.pass.cpp b/libcxx/test/numerics/numarray/template.valarray/types.pass.cpp
deleted file mode 100644
index 71421e543ff..00000000000
--- a/libcxx/test/numerics/numarray/template.valarray/types.pass.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-// <valarray>
-
-// template<class T>
-// class valarray
-// {
-// public:
-//     typedef T value_type;
-//     ...
-
-#include <valarray>
-#include <type_traits>
-
-int main()
-{
-    static_assert((std::is_same<std::valarray<int>::value_type, int>::value), "");
-    static_assert((std::is_same<std::valarray<double>::value_type, double>::value), "");
-}
diff --git a/libcxx/test/numerics/numarray/template.valarray/valarray.access/access.pass.cpp b/libcxx/test/numerics/numarray/template.valarray/valarray.access/access.pass.cpp
deleted file mode 100644
index 7bf164aafc2..00000000000
--- a/libcxx/test/numerics/numarray/template.valarray/valarray.access/access.pass.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-// <valarray>
-
-// template<class T> class valarray;
-
-// value_type& operator[](size_t i);
-
-#include <valarray>
-#include <cassert>
-
-int main()
-{
-    {
-        typedef int T;
-        T a[] = {5, 4, 3, 2, 1};
-        const unsigned N = sizeof(a)/sizeof(a[0]);
-        std::valarray<T> v(a, N);
-        for (int i = 0; i < N; ++i)
-        {
-            assert(v[i] == a[i]);
-            v[i] = i;
-            assert(v[i] == i);
-        }
-    }
-}
diff --git a/libcxx/test/numerics/numarray/template.valarray/valarray.access/const_access.pass.cpp b/libcxx/test/numerics/numarray/template.valarray/valarray.access/const_access.pass.cpp
deleted file mode 100644
index b9736eedd73..00000000000
--- a/libcxx/test/numerics/numarray/template.valarray/valarray.access/const_access.pass.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-// <valarray>
-
-// template<class T> class valarray;
-
-// const value_type& operator[](size_t i) const;
-
-#include <valarray>
-#include <cassert>
-
-int main()
-{
-    {
-        typedef int T;
-        T a[] = {5, 4, 3, 2, 1};
-        const unsigned N = sizeof(a)/sizeof(a[0]);
-        const std::valarray<T> v(a, N);
-        for (int i = 0; i < N; ++i)
-        {
-            assert(v[i] == a[i]);
-        }
-    }
-}
diff --git a/libcxx/test/numerics/numarray/template.valarray/valarray.assign/copy_assign.pass.cpp b/libcxx/test/numerics/numarray/template.valarray/valarray.assign/copy_assign.pass.cpp
deleted file mode 100644
index 2fc42ada85b..00000000000
--- a/libcxx/test/numerics/numarray/template.valarray/valarray.assign/copy_assign.pass.cpp
+++ /dev/null
@@ -1,58 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-// <valarray>
-
-// template<class T> class valarray;
-
-// valarray& operator=(const valarray& v);
-
-#include <valarray>
-#include <cassert>
-
-int main()
-{
-    {
-        typedef int T;
-        T a[] = {1, 2, 3, 4, 5};
-        const unsigned N = sizeof(a)/sizeof(a[0]);
-        std::valarray<T> v(a, N);
-        std::valarray<T> v2;
-        v2 = v;
-        assert(v2.size() == v.size());
-        for (int i = 0; i < v2.size(); ++i)
-            assert(v2[i] == v[i]);
-    }
-    {
-        typedef double T;
-        T a[] = {1, 2.5, 3, 4.25, 5};
-        const unsigned N = sizeof(a)/sizeof(a[0]);
-        std::valarray<T> v(a, N);
-        std::valarray<T> v2;
-        v2 = v;
-        assert(v2.size() == v.size());
-        for (int i = 0; i < v2.size(); ++i)
-            assert(v2[i] == v[i]);
-    }
-    {
-        typedef std::valarray<double> T;
-        T a[] = {T(1), T(2), T(3), T(4), T(5)};
-        const unsigned N = sizeof(a)/sizeof(a[0]);
-        std::valarray<T> v(a, N);
-        std::valarray<T> v2(a, N-2);
-        v2 = v;
-        assert(v2.size() == v.size());
-        for (int i = 0; i < N; ++i)
-        {
-            assert(v2[i].size() == v[i].size());
-            for (int j = 0; j < v[i].size(); ++j)
-                assert(v2[i][j] == v[i][j]);
-        }
-    }
-}
diff --git a/libcxx/test/numerics/numarray/template.valarray/valarray.assign/gslice_array_assign.pass.cpp b/libcxx/test/numerics/numarray/template.valarray/valarray.assign/gslice_array_assign.pass.cpp
deleted file mode 100644
index dff523f19e6..00000000000
--- a/libcxx/test/numerics/numarray/template.valarray/valarray.assign/gslice_array_assign.pass.cpp
+++ /dev/null
@@ -1,58 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-// <valarray>
-
-// template<class T> class valarray;
-
-// valarray& operator=(const gslice_array<value_type>& ga);
-
-#include <valarray>
-#include <cassert>
-
-int main()
-{
-    int a[] = { 0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11,
-               12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23,
-               24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35,
-               36, 37, 38, 39, 40};
-    std::valarray<int> v1(a, sizeof(a)/sizeof(a[0]));
-    std::size_t sz[] = {2, 4, 3};
-    std::size_t st[] = {19, 4, 1};
-    typedef std::valarray<std::size_t> sizes;
-    typedef std::valarray<std::size_t> strides;
-    std::valarray<int> v(24);
-    v = v1[std::gslice(3, sizes(sz, sizeof(sz)/sizeof(sz[0])),
-                          strides(st, sizeof(st)/sizeof(st[0])))];
-    assert(v.size() == 24);
-    assert(v[ 0] ==  3);
-    assert(v[ 1] ==  4);
-    assert(v[ 2] ==  5);
-    assert(v[ 3] ==  7);
-    assert(v[ 4] ==  8);
-    assert(v[ 5] ==  9);
-    assert(v[ 6] == 11);
-    assert(v[ 7] == 12);
-    assert(v[ 8] == 13);
-    assert(v[ 9] == 15);
-    assert(v[10] == 16);
-    assert(v[11] == 17);
-    assert(v[12] == 22);
-    assert(v[13] == 23);
-    assert(v[14] == 24);
-    assert(v[15] == 26);
-    assert(v[16] == 27);
-    assert(v[17] == 28);
-    assert(v[18] == 30);
-    assert(v[19] == 31);
-    assert(v[20] == 32);
-    assert(v[21] == 34);
-    assert(v[22] == 35);
-    assert(v[23] == 36);
-}
diff --git a/libcxx/test/numerics/numarray/template.valarray/valarray.assign/indirect_array_assign.pass.cpp b/libcxx/test/numerics/numarray/template.valarray/valarray.assign/indirect_array_assign.pass.cpp
deleted file mode 100644
index 6e8069cc2fa..00000000000
--- a/libcxx/test/numerics/numarray/template.valarray/valarray.assign/indirect_array_assign.pass.cpp
+++ /dev/null
@@ -1,58 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-// <valarray>
-
-// template<class T> class valarray;
-
-// valarray& operator=(const indirect_array<value_type>& ia);
-
-#include <valarray>
-#include <cassert>
-
-int main()
-{
-    int a[] = { 0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11,
-               12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23,
-               24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35,
-               36, 37, 38, 39, 40};
-    const std::size_t N1 = sizeof(a)/sizeof(a[0]);
-    std::size_t s[] = { 3,  4,  5,  7,  8,  9, 11, 12, 13, 15, 16, 17,
-                       22, 23, 24, 26, 27, 28, 30, 31, 32, 34, 35, 36};
-    const std::size_t S = sizeof(s)/sizeof(s[0]);
-    std::valarray<int> v1(a, N1);
-    std::valarray<std::size_t> ia(s, S);
-    std::valarray<int> v(24);
-    v = v1[ia];
-    assert(v.size() == 24);
-    assert(v[ 0] ==  3);
-    assert(v[ 1] ==  4);
-    assert(v[ 2] ==  5);
-    assert(v[ 3] ==  7);
-    assert(v[ 4] ==  8);
-    assert(v[ 5] ==  9);
-    assert(v[ 6] == 11);
-    assert(v[ 7] == 12);
-    assert(v[ 8] == 13);
-    assert(v[ 9] == 15);
-    assert(v[10] == 16);
-    assert(v[11] == 17);
-    assert(v[12] == 22);
-    assert(v[13] == 23);
-    assert(v[14] == 24);
-    assert(v[15] == 26);
-    assert(v[16] == 27);
-    assert(v[17] == 28);
-    assert(v[18] == 30);
-    assert(v[19] == 31);
-    assert(v[20] == 32);
-    assert(v[21] == 34);
-    assert(v[22] == 35);
-    assert(v[23] == 36);
-}
diff --git a/libcxx/test/numerics/numarray/template.valarray/valarray.assign/initializer_list_assign.pass.cpp b/libcxx/test/numerics/numarray/template.valarray/valarray.assign/initializer_list_assign.pass.cpp
deleted file mode 100644
index 571f56acd57..00000000000
--- a/libcxx/test/numerics/numarray/template.valarray/valarray.assign/initializer_list_assign.pass.cpp
+++ /dev/null
@@ -1,57 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-// <valarray>
-
-// template<class T> class valarray;
-
-// valarray& operator=(initializer_list<value_type> il);
-
-#include <valarray>
-#include <cassert>
-
-int main()
-{
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    {
-        typedef int T;
-        T a[] = {1, 2, 3, 4, 5};
-        const unsigned N = sizeof(a)/sizeof(a[0]);
-        std::valarray<T> v2;
-        v2 = {1, 2, 3, 4, 5};
-        assert(v2.size() == N);
-        for (int i = 0; i < v2.size(); ++i)
-            assert(v2[i] == a[i]);
-    }
-    {
-        typedef double T;
-        T a[] = {1, 2.5, 3, 4.25, 5};
-        const unsigned N = sizeof(a)/sizeof(a[0]);
-        std::valarray<T> v2;
-        v2 = {1, 2.5, 3, 4.25, 5};
-        assert(v2.size() == N);
-        for (int i = 0; i < v2.size(); ++i)
-            assert(v2[i] == a[i]);
-    }
-    {
-        typedef std::valarray<double> T;
-        T a[] = {T(1), T(2), T(3), T(4), T(5)};
-        const unsigned N = sizeof(a)/sizeof(a[0]);
-        std::valarray<T> v2(a, N-2);
-        v2 = {T(1), T(2), T(3), T(4), T(5)};
-        assert(v2.size() == N);
-        for (int i = 0; i < N; ++i)
-        {
-            assert(v2[i].size() == a[i].size());
-            for (int j = 0; j < a[i].size(); ++j)
-                assert(v2[i][j] == a[i][j]);
-        }
-    }
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-}
diff --git a/libcxx/test/numerics/numarray/template.valarray/valarray.assign/mask_array_assign.pass.cpp b/libcxx/test/numerics/numarray/template.valarray/valarray.assign/mask_array_assign.pass.cpp
deleted file mode 100644
index a52c9d9d672..00000000000
--- a/libcxx/test/numerics/numarray/template.valarray/valarray.assign/mask_array_assign.pass.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-// <valarray>
-
-// template<class T> class valarray;
-
-// valarray& operator=(const mask_array<value_type>& ma);
-
-#include <valarray>
-#include <cassert>
-
-int main()
-{
-    int a1[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15};
-    const std::size_t N1 = sizeof(a1)/sizeof(a1[0]);
-    bool b[N1] = {true,  false, false, true,  true,  false,
-                  false, true,  false, false, false, true};
-    std::valarray<int> v1(a1, N1);
-    std::valarray<bool> vb(b, N1);
-    std::valarray<int> v2(5);
-    v2 = v1[vb];
-    assert(v2.size() == 5);
-    assert(v2[ 0] ==  0);
-    assert(v2[ 1] ==  3);
-    assert(v2[ 2] ==  4);
-    assert(v2[ 3] ==  7);
-    assert(v2[ 4] == 11);
-}
diff --git a/libcxx/test/numerics/numarray/template.valarray/valarray.assign/move_assign.pass.cpp b/libcxx/test/numerics/numarray/template.valarray/valarray.assign/move_assign.pass.cpp
deleted file mode 100644
index d4f750652e2..00000000000
--- a/libcxx/test/numerics/numarray/template.valarray/valarray.assign/move_assign.pass.cpp
+++ /dev/null
@@ -1,63 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-// <valarray>
-
-// template<class T> class valarray;
-
-// valarray& operator=(valarray&& v);
-
-#include <valarray>
-#include <cassert>
-
-int main()
-{
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    {
-        typedef int T;
-        T a[] = {1, 2, 3, 4, 5};
-        const unsigned N = sizeof(a)/sizeof(a[0]);
-        std::valarray<T> v(a, N);
-        std::valarray<T> v2;
-        v2 = std::move(v);
-        assert(v2.size() == N);
-        assert(v.size() == 0);
-        for (int i = 0; i < v2.size(); ++i)
-            assert(v2[i] == a[i]);
-    }
-    {
-        typedef double T;
-        T a[] = {1, 2.5, 3, 4.25, 5};
-        const unsigned N = sizeof(a)/sizeof(a[0]);
-        std::valarray<T> v(a, N);
-        std::valarray<T> v2;
-        v2 = std::move(v);
-        assert(v2.size() == N);
-        assert(v.size() == 0);
-        for (int i = 0; i < v2.size(); ++i)
-            assert(v2[i] == a[i]);
-    }
-    {
-        typedef std::valarray<double> T;
-        T a[] = {T(1), T(2), T(3), T(4), T(5)};
-        const unsigned N = sizeof(a)/sizeof(a[0]);
-        std::valarray<T> v(a, N);
-        std::valarray<T> v2(a, N-2);
-        v2 = std::move(v);
-        assert(v2.size() == N);
-        assert(v.size() == 0);
-        for (int i = 0; i < N; ++i)
-        {
-            assert(v2[i].size() == a[i].size());
-            for (int j = 0; j < a[i].size(); ++j)
-                assert(v2[i][j] == a[i][j]);
-        }
-    }
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-}
diff --git a/libcxx/test/numerics/numarray/template.valarray/valarray.assign/slice_array_assign.pass.cpp b/libcxx/test/numerics/numarray/template.valarray/valarray.assign/slice_array_assign.pass.cpp
deleted file mode 100644
index 9a7517aa1f4..00000000000
--- a/libcxx/test/numerics/numarray/template.valarray/valarray.assign/slice_array_assign.pass.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-// <valarray>
-
-// template<class T> class valarray;
-
-// valarray& operator=(const slice_array<value_type>& sa);
-
-#include <valarray>
-#include <cassert>
-
-int main()
-{
-    int a[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15};
-    std::valarray<int> v1(a, sizeof(a)/sizeof(a[0]));
-    std::valarray<int> v(5);
-    v = v1[std::slice(1, 5, 3)];
-    assert(v.size() == 5);
-    assert(v[0] == 1);
-    assert(v[1] == 4);
-    assert(v[2] == 7);
-    assert(v[3] == 10);
-    assert(v[4] == 13);
-}
diff --git a/libcxx/test/numerics/numarray/template.valarray/valarray.assign/value_assign.pass.cpp b/libcxx/test/numerics/numarray/template.valarray/valarray.assign/value_assign.pass.cpp
deleted file mode 100644
index b9d67f86a21..00000000000
--- a/libcxx/test/numerics/numarray/template.valarray/valarray.assign/value_assign.pass.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-// <valarray>
-
-// template<class T> class valarray;
-
-// valarray& operator=(const value_type& x);
-
-#include <valarray>
-#include <cassert>
-
-int main()
-{
-    {
-        typedef int T;
-        T a[] = {1, 2, 3, 4, 5};
-        const unsigned N = sizeof(a)/sizeof(a[0]);
-        std::valarray<T> v(a, N);
-        v = 7;
-        assert(v.size() == N);
-        for (int i = 0; i < v.size(); ++i)
-            assert(v[i] == 7);
-    }
-}
diff --git a/libcxx/test/numerics/numarray/template.valarray/valarray.cassign/and_valarray.pass.cpp b/libcxx/test/numerics/numarray/template.valarray/valarray.cassign/and_valarray.pass.cpp
deleted file mode 100644
index 5b1c1b9911b..00000000000
--- a/libcxx/test/numerics/numarray/template.valarray/valarray.cassign/and_valarray.pass.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-// <valarray>
-
-// template<class T> class valarray;
-
-// valarray& operator&=(const valarray& v);
-
-#include <valarray>
-#include <cassert>
-
-int main()
-{
-    {
-        typedef int T;
-        T a1[] = {1,  2,  3,  4,  5};
-        T a2[] = {6,  7,  8,  9, 10};
-        T a3[] = {0,  2,  0,  0,  0};
-        const unsigned N = sizeof(a1)/sizeof(a1[0]);
-        std::valarray<T> v1(a1, N);
-        std::valarray<T> v2(a2, N);
-        std::valarray<T> v3(a3, N);
-        v1 &= v2;
-        assert(v1.size() == v2.size());
-        assert(v1.size() == v3.size());
-        for (int i = 0; i < v1.size(); ++i)
-            assert(v1[i] == v3[i]);
-    }
-}
diff --git a/libcxx/test/numerics/numarray/template.valarray/valarray.cassign/and_value.pass.cpp b/libcxx/test/numerics/numarray/template.valarray/valarray.cassign/and_value.pass.cpp
deleted file mode 100644
index 2106a13e2c3..00000000000
--- a/libcxx/test/numerics/numarray/template.valarray/valarray.cassign/and_value.pass.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-// <valarray>
-
-// template<class T> class valarray;
-
-// valarray& operator&=(const value_type& x);
-
-#include <valarray>
-#include <cassert>
-
-int main()
-{
-    {
-        typedef int T;
-        T a1[] = { 1,   2,  3,  4,  5};
-        T a2[] = { 1,   2,  3,  0,  1};
-        const unsigned N = sizeof(a1)/sizeof(a1[0]);
-        std::valarray<T> v1(a1, N);
-        std::valarray<T> v2(a2, N);
-        v1 &= 3;
-        assert(v1.size() == v2.size());
-        for (int i = 0; i < v1.size(); ++i)
-            assert(v1[i] == v2[i]);
-    }
-}
diff --git a/libcxx/test/numerics/numarray/template.valarray/valarray.cassign/divide_valarray.pass.cpp b/libcxx/test/numerics/numarray/template.valarray/valarray.cassign/divide_valarray.pass.cpp
deleted file mode 100644
index 3992d0aa43d..00000000000
--- a/libcxx/test/numerics/numarray/template.valarray/valarray.cassign/divide_valarray.pass.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-// <valarray>
-
-// template<class T> class valarray;
-
-// valarray& operator/=(const valarray& v);
-
-#include <valarray>
-#include <cassert>
-
-int main()
-{
-    {
-        typedef int T;
-        T a1[] = {1,  2,  3,  4,  5};
-        T a2[] = {6,  7,  8,  9, 10};
-        T a3[] = {6, 14, 24, 36, 50};
-        const unsigned N = sizeof(a1)/sizeof(a1[0]);
-        std::valarray<T> v1(a1, N);
-        std::valarray<T> v2(a2, N);
-        std::valarray<T> v3(a3, N);
-        v3 /= v2;
-        assert(v1.size() == v2.size());
-        assert(v1.size() == v3.size());
-        for (int i = 0; i < v1.size(); ++i)
-            assert(v1[i] == v3[i]);
-    }
-}
diff --git a/libcxx/test/numerics/numarray/template.valarray/valarray.cassign/divide_value.pass.cpp b/libcxx/test/numerics/numarray/template.valarray/valarray.cassign/divide_value.pass.cpp
deleted file mode 100644
index 7bd1cc84df6..00000000000
--- a/libcxx/test/numerics/numarray/template.valarray/valarray.cassign/divide_value.pass.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-// <valarray>
-
-// template<class T> class valarray;
-
-// valarray& operator/=(const value_type& x);
-
-#include <valarray>
-#include <cassert>
-
-int main()
-{
-    {
-        typedef int T;
-        T a1[] = {1,  2,  3,  4,  5};
-        T a2[] = {6, 12, 18, 24, 30};
-        const unsigned N = sizeof(a1)/sizeof(a1[0]);
-        std::valarray<T> v1(a1, N);
-        std::valarray<T> v2(a2, N);
-        v2 /= 6;
-        assert(v1.size() == v2.size());
-        for (int i = 0; i < v1.size(); ++i)
-            assert(v1[i] == v2[i]);
-    }
-}
diff --git a/libcxx/test/numerics/numarray/template.valarray/valarray.cassign/minus_valarray.pass.cpp b/libcxx/test/numerics/numarray/template.valarray/valarray.cassign/minus_valarray.pass.cpp
deleted file mode 100644
index e3d308abacc..00000000000
--- a/libcxx/test/numerics/numarray/template.valarray/valarray.cassign/minus_valarray.pass.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-// <valarray>
-
-// template<class T> class valarray;
-
-// valarray& operator-=(const valarray& v);
-
-#include <valarray>
-#include <cassert>
-
-int main()
-{
-    {
-        typedef int T;
-        T a1[] = {1,  2,  3,  4,  5};
-        T a2[] = {6,  7,  8,  9, 10};
-        T a3[] = {7,  9, 11, 13, 15};
-        const unsigned N = sizeof(a1)/sizeof(a1[0]);
-        std::valarray<T> v1(a1, N);
-        std::valarray<T> v2(a2, N);
-        std::valarray<T> v3(a3, N);
-        v3 -= v2;
-        assert(v1.size() == v2.size());
-        assert(v1.size() == v3.size());
-        for (int i = 0; i < v1.size(); ++i)
-            assert(v1[i] == v3[i]);
-    }
-}
diff --git a/libcxx/test/numerics/numarray/template.valarray/valarray.cassign/minus_value.pass.cpp b/libcxx/test/numerics/numarray/template.valarray/valarray.cassign/minus_value.pass.cpp
deleted file mode 100644
index 27ea8c2c036..00000000000
--- a/libcxx/test/numerics/numarray/template.valarray/valarray.cassign/minus_value.pass.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-// <valarray>
-
-// template<class T> class valarray;
-
-// valarray& operator-=(const value_type& x);
-
-#include <valarray>
-#include <cassert>
-
-int main()
-{
-    {
-        typedef int T;
-        T a1[] = { 1,   2,  3,  4,  5};
-        T a2[] = {-2,  -1,  0,  1,  2};
-        const unsigned N = sizeof(a1)/sizeof(a1[0]);
-        std::valarray<T> v1(a1, N);
-        std::valarray<T> v2(a2, N);
-        v1 -= 3;
-        assert(v1.size() == v2.size());
-        for (int i = 0; i < v1.size(); ++i)
-            assert(v1[i] == v2[i]);
-    }
-}
diff --git a/libcxx/test/numerics/numarray/template.valarray/valarray.cassign/modulo_valarray.pass.cpp b/libcxx/test/numerics/numarray/template.valarray/valarray.cassign/modulo_valarray.pass.cpp
deleted file mode 100644
index 1754a5575eb..00000000000
--- a/libcxx/test/numerics/numarray/template.valarray/valarray.cassign/modulo_valarray.pass.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-// <valarray>
-
-// template<class T> class valarray;
-
-// valarray& operator%=(const valarray& v);
-
-#include <valarray>
-#include <cassert>
-
-int main()
-{
-    {
-        typedef int T;
-        T a1[] = {1,  2,  3,  4,  5};
-        T a2[] = {6,  7,  8,  9, 10};
-        T a3[] = {0,  1,  2,  1,  0};
-        const unsigned N = sizeof(a1)/sizeof(a1[0]);
-        std::valarray<T> v1(a1, N);
-        std::valarray<T> v2(a2, N);
-        std::valarray<T> v3(a3, N);
-        v2 %= v1;
-        assert(v1.size() == v2.size());
-        assert(v1.size() == v3.size());
-        for (int i = 0; i < v1.size(); ++i)
-            assert(v2[i] == v3[i]);
-    }
-}
diff --git a/libcxx/test/numerics/numarray/template.valarray/valarray.cassign/modulo_value.pass.cpp b/libcxx/test/numerics/numarray/template.valarray/valarray.cassign/modulo_value.pass.cpp
deleted file mode 100644
index 794a0b62926..00000000000
--- a/libcxx/test/numerics/numarray/template.valarray/valarray.cassign/modulo_value.pass.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-// <valarray>
-
-// template<class T> class valarray;
-
-// valarray& operator%=(const value_type& x);
-
-#include <valarray>
-#include <cassert>
-
-int main()
-{
-    {
-        typedef int T;
-        T a1[] = {1,  2,  3,  4,  5};
-        T a2[] = {1,  2,  0,  1,  2};
-        const unsigned N = sizeof(a1)/sizeof(a1[0]);
-        std::valarray<T> v1(a1, N);
-        std::valarray<T> v2(a2, N);
-        v1 %= 3;
-        assert(v1.size() == v2.size());
-        for (int i = 0; i < v1.size(); ++i)
-            assert(v1[i] == v2[i]);
-    }
-}
diff --git a/libcxx/test/numerics/numarray/template.valarray/valarray.cassign/or_valarray.pass.cpp b/libcxx/test/numerics/numarray/template.valarray/valarray.cassign/or_valarray.pass.cpp
deleted file mode 100644
index 0d70b4e715d..00000000000
--- a/libcxx/test/numerics/numarray/template.valarray/valarray.cassign/or_valarray.pass.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-// <valarray>
-
-// template<class T> class valarray;
-
-// valarray& operator|=(const valarray& v);
-
-#include <valarray>
-#include <cassert>
-
-int main()
-{
-    {
-        typedef int T;
-        T a1[] = {1,  2,  3,  4,  5};
-        T a2[] = {6,  7,  8,  9, 10};
-        T a3[] = {7,  7, 11, 13, 15};
-        const unsigned N = sizeof(a1)/sizeof(a1[0]);
-        std::valarray<T> v1(a1, N);
-        std::valarray<T> v2(a2, N);
-        std::valarray<T> v3(a3, N);
-        v1 |= v2;
-        assert(v1.size() == v2.size());
-        assert(v1.size() == v3.size());
-        for (int i = 0; i < v1.size(); ++i)
-            assert(v1[i] == v3[i]);
-    }
-}
diff --git a/libcxx/test/numerics/numarray/template.valarray/valarray.cassign/or_value.pass.cpp b/libcxx/test/numerics/numarray/template.valarray/valarray.cassign/or_value.pass.cpp
deleted file mode 100644
index 4030907ff3e..00000000000
--- a/libcxx/test/numerics/numarray/template.valarray/valarray.cassign/or_value.pass.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-// <valarray>
-
-// template<class T> class valarray;
-
-// valarray& operator|=(const value_type& x);
-
-#include <valarray>
-#include <cassert>
-
-int main()
-{
-    {
-        typedef int T;
-        T a1[] = { 1,   2,  3,  4,  5};
-        T a2[] = { 3,   3,  3,  7,  7};
-        const unsigned N = sizeof(a1)/sizeof(a1[0]);
-        std::valarray<T> v1(a1, N);
-        std::valarray<T> v2(a2, N);
-        v1 |= 3;
-        assert(v1.size() == v2.size());
-        for (int i = 0; i < v1.size(); ++i)
-            assert(v1[i] == v2[i]);
-    }
-}
diff --git a/libcxx/test/numerics/numarray/template.valarray/valarray.cassign/plus_valarray.pass.cpp b/libcxx/test/numerics/numarray/template.valarray/valarray.cassign/plus_valarray.pass.cpp
deleted file mode 100644
index fdf999c2a04..00000000000
--- a/libcxx/test/numerics/numarray/template.valarray/valarray.cassign/plus_valarray.pass.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-// <valarray>
-
-// template<class T> class valarray;
-
-// valarray& operator+=(const valarray& v);
-
-#include <valarray>
-#include <cassert>
-
-int main()
-{
-    {
-        typedef int T;
-        T a1[] = {1,  2,  3,  4,  5};
-        T a2[] = {6,  7,  8,  9, 10};
-        T a3[] = {7,  9, 11, 13, 15};
-        const unsigned N = sizeof(a1)/sizeof(a1[0]);
-        std::valarray<T> v1(a1, N);
-        std::valarray<T> v2(a2, N);
-        std::valarray<T> v3(a3, N);
-        v1 += v2;
-        assert(v1.size() == v2.size());
-        assert(v1.size() == v3.size());
-        for (int i = 0; i < v1.size(); ++i)
-            assert(v1[i] == v3[i]);
-    }
-}
diff --git a/libcxx/test/numerics/numarray/template.valarray/valarray.cassign/plus_value.pass.cpp b/libcxx/test/numerics/numarray/template.valarray/valarray.cassign/plus_value.pass.cpp
deleted file mode 100644
index 23d6d9d0522..00000000000
--- a/libcxx/test/numerics/numarray/template.valarray/valarray.cassign/plus_value.pass.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-// <valarray>
-
-// template<class T> class valarray;
-
-// valarray& operator+=(const value_type& x);
-
-#include <valarray>
-#include <cassert>
-
-int main()
-{
-    {
-        typedef int T;
-        T a1[] = {1,  2,  3,  4,  5};
-        T a2[] = {4,  5,  6,  7,  8};
-        const unsigned N = sizeof(a1)/sizeof(a1[0]);
-        std::valarray<T> v1(a1, N);
-        std::valarray<T> v2(a2, N);
-        v1 += 3;
-        assert(v1.size() == v2.size());
-        for (int i = 0; i < v1.size(); ++i)
-            assert(v1[i] == v2[i]);
-    }
-}
diff --git a/libcxx/test/numerics/numarray/template.valarray/valarray.cassign/shift_left_valarray.pass.cpp b/libcxx/test/numerics/numarray/template.valarray/valarray.cassign/shift_left_valarray.pass.cpp
deleted file mode 100644
index ad44e3887ec..00000000000
--- a/libcxx/test/numerics/numarray/template.valarray/valarray.cassign/shift_left_valarray.pass.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-// <valarray>
-
-// template<class T> class valarray;
-
-// valarray& operator<<=(const valarray& v);
-
-#include <valarray>
-#include <cassert>
-
-int main()
-{
-    {
-        typedef int T;
-        T a1[] = { 1,   2,   3,    4,    5};
-        T a2[] = { 6,   7,   8,    9,   10};
-        T a3[] = {64, 256, 768, 2048, 5120};
-        const unsigned N = sizeof(a1)/sizeof(a1[0]);
-        std::valarray<T> v1(a1, N);
-        std::valarray<T> v2(a2, N);
-        std::valarray<T> v3(a3, N);
-        v1 <<= v2;
-        assert(v1.size() == v2.size());
-        assert(v1.size() == v3.size());
-        for (int i = 0; i < v1.size(); ++i)
-            assert(v1[i] == v3[i]);
-    }
-}
diff --git a/libcxx/test/numerics/numarray/template.valarray/valarray.cassign/shift_left_value.pass.cpp b/libcxx/test/numerics/numarray/template.valarray/valarray.cassign/shift_left_value.pass.cpp
deleted file mode 100644
index 366407a95c6..00000000000
--- a/libcxx/test/numerics/numarray/template.valarray/valarray.cassign/shift_left_value.pass.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-// <valarray>
-
-// template<class T> class valarray;
-
-// valarray& operator<<=(const value_type& x);
-
-#include <valarray>
-#include <cassert>
-
-int main()
-{
-    {
-        typedef int T;
-        T a1[] = { 1,   2,  3,  4,  5};
-        T a2[] = { 8,  16, 24, 32, 40};
-        const unsigned N = sizeof(a1)/sizeof(a1[0]);
-        std::valarray<T> v1(a1, N);
-        std::valarray<T> v2(a2, N);
-        v1 <<= 3;
-        assert(v1.size() == v2.size());
-        for (int i = 0; i < v1.size(); ++i)
-            assert(v1[i] == v2[i]);
-    }
-}
diff --git a/libcxx/test/numerics/numarray/template.valarray/valarray.cassign/shift_right_valarray.pass.cpp b/libcxx/test/numerics/numarray/template.valarray/valarray.cassign/shift_right_valarray.pass.cpp
deleted file mode 100644
index f7df16b843c..00000000000
--- a/libcxx/test/numerics/numarray/template.valarray/valarray.cassign/shift_right_valarray.pass.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-// <valarray>
-
-// template<class T> class valarray;
-
-// valarray& operator>>=(const valarray& v);
-
-#include <valarray>
-#include <cassert>
-
-int main()
-{
-    {
-        typedef int T;
-        T a1[] = { 1,   2,   3,    4,    5};
-        T a2[] = { 6,   7,   8,    9,   10};
-        T a3[] = {64, 256, 768, 2048, 5120};
-        const unsigned N = sizeof(a1)/sizeof(a1[0]);
-        std::valarray<T> v1(a1, N);
-        std::valarray<T> v2(a2, N);
-        std::valarray<T> v3(a3, N);
-        v3 >>= v2;
-        assert(v1.size() == v2.size());
-        assert(v1.size() == v3.size());
-        for (int i = 0; i < v1.size(); ++i)
-            assert(v1[i] == v3[i]);
-    }
-}
diff --git a/libcxx/test/numerics/numarray/template.valarray/valarray.cassign/shift_right_value.pass.cpp b/libcxx/test/numerics/numarray/template.valarray/valarray.cassign/shift_right_value.pass.cpp
deleted file mode 100644
index 7c568b14cbe..00000000000
--- a/libcxx/test/numerics/numarray/template.valarray/valarray.cassign/shift_right_value.pass.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-// <valarray>
-
-// template<class T> class valarray;
-
-// valarray& operator>>=(const value_type& x);
-
-#include <valarray>
-#include <cassert>
-
-int main()
-{
-    {
-        typedef int T;
-        T a1[] = { 1,   2,  3,  4,  5};
-        T a2[] = { 8,  16, 24, 32, 40};
-        const unsigned N = sizeof(a1)/sizeof(a1[0]);
-        std::valarray<T> v1(a1, N);
-        std::valarray<T> v2(a2, N);
-        v2 >>= 3;
-        assert(v1.size() == v2.size());
-        for (int i = 0; i < v1.size(); ++i)
-            assert(v1[i] == v2[i]);
-    }
-}
diff --git a/libcxx/test/numerics/numarray/template.valarray/valarray.cassign/times_valarray.pass.cpp b/libcxx/test/numerics/numarray/template.valarray/valarray.cassign/times_valarray.pass.cpp
deleted file mode 100644
index d3cf1eb8864..00000000000
--- a/libcxx/test/numerics/numarray/template.valarray/valarray.cassign/times_valarray.pass.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-// <valarray>
-
-// template<class T> class valarray;
-
-// valarray& operator*=(const valarray& v);
-
-#include <valarray>
-#include <cassert>
-
-int main()
-{
-    {
-        typedef int T;
-        T a1[] = {1,  2,  3,  4,  5};
-        T a2[] = {6,  7,  8,  9, 10};
-        T a3[] = {6, 14, 24, 36, 50};
-        const unsigned N = sizeof(a1)/sizeof(a1[0]);
-        std::valarray<T> v1(a1, N);
-        std::valarray<T> v2(a2, N);
-        std::valarray<T> v3(a3, N);
-        v1 *= v2;
-        assert(v1.size() == v2.size());
-        assert(v1.size() == v3.size());
-        for (int i = 0; i < v1.size(); ++i)
-            assert(v1[i] == v3[i]);
-    }
-}
diff --git a/libcxx/test/numerics/numarray/template.valarray/valarray.cassign/times_value.pass.cpp b/libcxx/test/numerics/numarray/template.valarray/valarray.cassign/times_value.pass.cpp
deleted file mode 100644
index aea9806bc0d..00000000000
--- a/libcxx/test/numerics/numarray/template.valarray/valarray.cassign/times_value.pass.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-// <valarray>
-
-// template<class T> class valarray;
-
-// valarray& operator*=(const value_type& x);
-
-#include <valarray>
-#include <cassert>
-
-int main()
-{
-    {
-        typedef int T;
-        T a1[] = {1,  2,  3,  4,  5};
-        T a2[] = {6, 12, 18, 24, 30};
-        const unsigned N = sizeof(a1)/sizeof(a1[0]);
-        std::valarray<T> v1(a1, N);
-        std::valarray<T> v2(a2, N);
-        v1 *= 6;
-        assert(v1.size() == v2.size());
-        for (int i = 0; i < v1.size(); ++i)
-            assert(v1[i] == v2[i]);
-    }
-}
diff --git a/libcxx/test/numerics/numarray/template.valarray/valarray.cassign/xor_valarray.pass.cpp b/libcxx/test/numerics/numarray/template.valarray/valarray.cassign/xor_valarray.pass.cpp
deleted file mode 100644
index a10bd7e0a00..00000000000
--- a/libcxx/test/numerics/numarray/template.valarray/valarray.cassign/xor_valarray.pass.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-// <valarray>
-
-// template<class T> class valarray;
-
-// valarray& operator^=(const valarray& v);
-
-#include <valarray>
-#include <cassert>
-
-int main()
-{
-    {
-        typedef int T;
-        T a1[] = {1,  2,  3,  4,  5};
-        T a2[] = {6,  7,  8,  9, 10};
-        T a3[] = {7,  5, 11, 13, 15};
-        const unsigned N = sizeof(a1)/sizeof(a1[0]);
-        std::valarray<T> v1(a1, N);
-        std::valarray<T> v2(a2, N);
-        std::valarray<T> v3(a3, N);
-        v1 ^= v2;
-        assert(v1.size() == v2.size());
-        assert(v1.size() == v3.size());
-        for (int i = 0; i < v1.size(); ++i)
-            assert(v1[i] == v3[i]);
-    }
-}
diff --git a/libcxx/test/numerics/numarray/template.valarray/valarray.cassign/xor_value.pass.cpp b/libcxx/test/numerics/numarray/template.valarray/valarray.cassign/xor_value.pass.cpp
deleted file mode 100644
index 327952f7b3a..00000000000
--- a/libcxx/test/numerics/numarray/template.valarray/valarray.cassign/xor_value.pass.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-// <valarray>
-
-// template<class T> class valarray;
-
-// valarray& operator^=(const value_type& x);
-
-#include <valarray>
-#include <cassert>
-
-int main()
-{
-    {
-        typedef int T;
-        T a1[] = { 1,   2,  3,  4,  5};
-        T a2[] = { 2,   1,  0,  7,  6};
-        const unsigned N = sizeof(a1)/sizeof(a1[0]);
-        std::valarray<T> v1(a1, N);
-        std::valarray<T> v2(a2, N);
-        v1 ^= 3;
-        assert(v1.size() == v2.size());
-        for (int i = 0; i < v1.size(); ++i)
-            assert(v1[i] == v2[i]);
-    }
-}
diff --git a/libcxx/test/numerics/numarray/template.valarray/valarray.cons/copy.pass.cpp b/libcxx/test/numerics/numarray/template.valarray/valarray.cons/copy.pass.cpp
deleted file mode 100644
index 04ac2cdf1b9..00000000000
--- a/libcxx/test/numerics/numarray/template.valarray/valarray.cons/copy.pass.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-// <valarray>
-
-// template<class T> class valarray;
-
-// valarray(const valarray<value_type>& v);
-
-#include <valarray>
-#include <cassert>
-
-int main()
-{
-    {
-        typedef int T;
-        T a[] = {1, 2, 3, 4, 5};
-        const unsigned N = sizeof(a)/sizeof(a[0]);
-        std::valarray<T> v(a, N);
-        std::valarray<T> v2 = v;
-        assert(v2.size() == v.size());
-        for (int i = 0; i < v2.size(); ++i)
-            assert(v2[i] == v[i]);
-    }
-    {
-        typedef double T;
-        T a[] = {1, 2.5, 3, 4.25, 5};
-        const unsigned N = sizeof(a)/sizeof(a[0]);
-        std::valarray<T> v(a, N);
-        std::valarray<T> v2 = v;
-        assert(v2.size() == v.size());
-        for (int i = 0; i < v2.size(); ++i)
-            assert(v2[i] == v[i]);
-    }
-    {
-        typedef std::valarray<double> T;
-        T a[] = {T(1), T(2), T(3), T(4), T(5)};
-        const unsigned N = sizeof(a)/sizeof(a[0]);
-        std::valarray<T> v(a, N);
-        std::valarray<T> v2 = v;
-        assert(v2.size() == v.size());
-        for (int i = 0; i < N; ++i)
-        {
-            assert(v2[i].size() == v[i].size());
-            for (int j = 0; j < v[i].size(); ++j)
-                assert(v2[i][j] == v[i][j]);
-        }
-    }
-}
diff --git a/libcxx/test/numerics/numarray/template.valarray/valarray.cons/default.pass.cpp b/libcxx/test/numerics/numarray/template.valarray/valarray.cons/default.pass.cpp
deleted file mode 100644
index f46e0bf28cf..00000000000
--- a/libcxx/test/numerics/numarray/template.valarray/valarray.cons/default.pass.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-// <valarray>
-
-// template<class T> class valarray;
-
-// valarray();
-
-#include <valarray>
-#include <cassert>
-
-int main()
-{
-    {
-        std::valarray<int> v;
-        assert(v.size() == 0);
-    }
-    {
-        std::valarray<float> v;
-        assert(v.size() == 0);
-    }
-    {
-        std::valarray<double> v;
-        assert(v.size() == 0);
-    }
-    {
-        std::valarray<std::valarray<double> > v;
-        assert(v.size() == 0);
-    }
-}
diff --git a/libcxx/test/numerics/numarray/template.valarray/valarray.cons/gslice_array.pass.cpp b/libcxx/test/numerics/numarray/template.valarray/valarray.cons/gslice_array.pass.cpp
deleted file mode 100644
index 56601dc9253..00000000000
--- a/libcxx/test/numerics/numarray/template.valarray/valarray.cons/gslice_array.pass.cpp
+++ /dev/null
@@ -1,57 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-// <valarray>
-
-// template<class T> class valarray;
-
-// valarray(const gslice_array<value_type>& sa);
-
-#include <valarray>
-#include <cassert>
-
-int main()
-{
-    int a[] = { 0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11,
-               12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23,
-               24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35,
-               36, 37, 38, 39, 40};
-    std::valarray<int> v1(a, sizeof(a)/sizeof(a[0]));
-    std::size_t sz[] = {2, 4, 3};
-    std::size_t st[] = {19, 4, 1};
-    typedef std::valarray<std::size_t> sizes;
-    typedef std::valarray<std::size_t> strides;
-    std::valarray<int> v(v1[std::gslice(3, sizes(sz, sizeof(sz)/sizeof(sz[0])),
-                                         strides(st, sizeof(st)/sizeof(st[0])))]);
-    assert(v.size() == 24);
-    assert(v[ 0] ==  3);
-    assert(v[ 1] ==  4);
-    assert(v[ 2] ==  5);
-    assert(v[ 3] ==  7);
-    assert(v[ 4] ==  8);
-    assert(v[ 5] ==  9);
-    assert(v[ 6] == 11);
-    assert(v[ 7] == 12);
-    assert(v[ 8] == 13);
-    assert(v[ 9] == 15);
-    assert(v[10] == 16);
-    assert(v[11] == 17);
-    assert(v[12] == 22);
-    assert(v[13] == 23);
-    assert(v[14] == 24);
-    assert(v[15] == 26);
-    assert(v[16] == 27);
-    assert(v[17] == 28);
-    assert(v[18] == 30);
-    assert(v[19] == 31);
-    assert(v[20] == 32);
-    assert(v[21] == 34);
-    assert(v[22] == 35);
-    assert(v[23] == 36);
-}
diff --git a/libcxx/test/numerics/numarray/template.valarray/valarray.cons/indirect_array.pass.cpp b/libcxx/test/numerics/numarray/template.valarray/valarray.cons/indirect_array.pass.cpp
deleted file mode 100644
index dbca1f9c766..00000000000
--- a/libcxx/test/numerics/numarray/template.valarray/valarray.cons/indirect_array.pass.cpp
+++ /dev/null
@@ -1,57 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-// <valarray>
-
-// template<class T> class valarray;
-
-// valarray(const indirect_array<value_type>& ia);
-
-#include <valarray>
-#include <cassert>
-
-int main()
-{
-    int a[] = { 0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11,
-               12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23,
-               24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35,
-               36, 37, 38, 39, 40};
-    const std::size_t N1 = sizeof(a)/sizeof(a[0]);
-    std::size_t s[] = { 3,  4,  5,  7,  8,  9, 11, 12, 13, 15, 16, 17,
-                       22, 23, 24, 26, 27, 28, 30, 31, 32, 34, 35, 36};
-    const std::size_t S = sizeof(s)/sizeof(s[0]);
-    std::valarray<int> v1(a, N1);
-    std::valarray<std::size_t> ia(s, S);
-    std::valarray<int> v(v1[ia]);
-    assert(v.size() == 24);
-    assert(v[ 0] ==  3);
-    assert(v[ 1] ==  4);
-    assert(v[ 2] ==  5);
-    assert(v[ 3] ==  7);
-    assert(v[ 4] ==  8);
-    assert(v[ 5] ==  9);
-    assert(v[ 6] == 11);
-    assert(v[ 7] == 12);
-    assert(v[ 8] == 13);
-    assert(v[ 9] == 15);
-    assert(v[10] == 16);
-    assert(v[11] == 17);
-    assert(v[12] == 22);
-    assert(v[13] == 23);
-    assert(v[14] == 24);
-    assert(v[15] == 26);
-    assert(v[16] == 27);
-    assert(v[17] == 28);
-    assert(v[18] == 30);
-    assert(v[19] == 31);
-    assert(v[20] == 32);
-    assert(v[21] == 34);
-    assert(v[22] == 35);
-    assert(v[23] == 36);
-}
diff --git a/libcxx/test/numerics/numarray/template.valarray/valarray.cons/initializer_list.pass.cpp b/libcxx/test/numerics/numarray/template.valarray/valarray.cons/initializer_list.pass.cpp
deleted file mode 100644
index 1ab460f1b9d..00000000000
--- a/libcxx/test/numerics/numarray/template.valarray/valarray.cons/initializer_list.pass.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-// <valarray>
-
-// template<class T> class valarray;
-
-// valarray(initializer_list<value_type>);
-
-#include <valarray>
-#include <cassert>
-
-int main()
-{
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    {
-        typedef int T;
-        T a[] = {1, 2, 3, 4, 5};
-        const unsigned N = sizeof(a)/sizeof(a[0]);
-        std::valarray<T> v = {1, 2, 3, 4, 5};
-        assert(v.size() == N);
-        for (int i = 0; i < N; ++i)
-            assert(v[i] == a[i]);
-    }
-    {
-        typedef double T;
-        T a[] = {1, 2, 3, 4, 5};
-        const unsigned N = sizeof(a)/sizeof(a[0]);
-        std::valarray<T> v = {1, 2, 3, 4, 5};
-        assert(v.size() == N);
-        for (int i = 0; i < N; ++i)
-            assert(v[i] == a[i]);
-    }
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-}
diff --git a/libcxx/test/numerics/numarray/template.valarray/valarray.cons/mask_array.pass.cpp b/libcxx/test/numerics/numarray/template.valarray/valarray.cons/mask_array.pass.cpp
deleted file mode 100644
index be4f7403945..00000000000
--- a/libcxx/test/numerics/numarray/template.valarray/valarray.cons/mask_array.pass.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-// <valarray>
-
-// template<class T> class valarray;
-
-// valarray(const mask_array<value_type>& ma);
-
-#include <valarray>
-#include <cassert>
-
-int main()
-{
-    int a1[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15};
-    const std::size_t N1 = sizeof(a1)/sizeof(a1[0]);
-    bool b[N1] = {true,  false, false, true,  true,  false,
-                  false, true,  false, false, false, true};
-    std::valarray<int> v1(a1, N1);
-    std::valarray<bool> vb(b, N1);
-    std::valarray<int> v2(v1[vb]);
-    assert(v2.size() == 5);
-    assert(v2[ 0] ==  0);
-    assert(v2[ 1] ==  3);
-    assert(v2[ 2] ==  4);
-    assert(v2[ 3] ==  7);
-    assert(v2[ 4] == 11);
-}
diff --git a/libcxx/test/numerics/numarray/template.valarray/valarray.cons/move.pass.cpp b/libcxx/test/numerics/numarray/template.valarray/valarray.cons/move.pass.cpp
deleted file mode 100644
index 6ac8773fa4e..00000000000
--- a/libcxx/test/numerics/numarray/template.valarray/valarray.cons/move.pass.cpp
+++ /dev/null
@@ -1,61 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-// <valarray>
-
-// template<class T> class valarray;
-
-// valarray(const valarray<value_type>& v);
-
-#include <valarray>
-#include <utility>
-#include <cassert>
-
-int main()
-{
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    {
-        typedef int T;
-        T a[] = {1, 2, 3, 4, 5};
-        const unsigned N = sizeof(a)/sizeof(a[0]);
-        std::valarray<T> v(a, N);
-        std::valarray<T> v2 = std::move(v);
-        assert(v2.size() == N);
-        assert(v.size() == 0);
-        for (int i = 0; i < v2.size(); ++i)
-            assert(v2[i] == a[i]);
-    }
-    {
-        typedef double T;
-        T a[] = {1, 2.5, 3, 4.25, 5};
-        const unsigned N = sizeof(a)/sizeof(a[0]);
-        std::valarray<T> v(a, N);
-        std::valarray<T> v2 = std::move(v);
-        assert(v2.size() == N);
-        assert(v.size() == 0);
-        for (int i = 0; i < v2.size(); ++i)
-            assert(v2[i] == a[i]);
-    }
-    {
-        typedef std::valarray<double> T;
-        T a[] = {T(1), T(2), T(3), T(4), T(5)};
-        const unsigned N = sizeof(a)/sizeof(a[0]);
-        std::valarray<T> v(a, N);
-        std::valarray<T> v2 = std::move(v);
-        assert(v2.size() == N);
-        assert(v.size() == 0);
-        for (int i = 0; i < N; ++i)
-        {
-            assert(v2[i].size() == a[i].size());
-            for (int j = 0; j < v2[i].size(); ++j)
-                assert(v2[i][j] == a[i][j]);
-        }
-    }
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-}
diff --git a/libcxx/test/numerics/numarray/template.valarray/valarray.cons/pointer_size.pass.cpp b/libcxx/test/numerics/numarray/template.valarray/valarray.cons/pointer_size.pass.cpp
deleted file mode 100644
index 3d3649ee40a..00000000000
--- a/libcxx/test/numerics/numarray/template.valarray/valarray.cons/pointer_size.pass.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-// <valarray>
-
-// template<class T> class valarray;
-
-// valarray(const value_type* p, size_t n);
-
-#include <valarray>
-#include <cassert>
-
-int main()
-{
-    {
-        typedef int T;
-        T a[] = {1, 2, 3, 4, 5};
-        const unsigned N = sizeof(a)/sizeof(a[0]);
-        std::valarray<T> v(a, N);
-        assert(v.size() == N);
-        for (int i = 0; i < N; ++i)
-            assert(v[i] == a[i]);
-    }
-    {
-        typedef double T;
-        T a[] = {1, 2.5, 3, 4.25, 5};
-        const unsigned N = sizeof(a)/sizeof(a[0]);
-        std::valarray<T> v(a, N);
-        assert(v.size() == N);
-        for (int i = 0; i < N; ++i)
-            assert(v[i] == a[i]);
-    }
-    {
-        typedef std::valarray<double> T;
-        T a[] = {T(1), T(2), T(3), T(4), T(5)};
-        const unsigned N = sizeof(a)/sizeof(a[0]);
-        std::valarray<T> v(a, N);
-        assert(v.size() == N);
-        for (int i = 0; i < N; ++i)
-        {
-            assert(v[i].size() == a[i].size());
-            for (int j = 0; j < v[i].size(); ++j)
-                assert(v[i][j] == a[i][j]);
-        }
-    }
-}
diff --git a/libcxx/test/numerics/numarray/template.valarray/valarray.cons/size.pass.cpp b/libcxx/test/numerics/numarray/template.valarray/valarray.cons/size.pass.cpp
deleted file mode 100644
index 359073eb3ae..00000000000
--- a/libcxx/test/numerics/numarray/template.valarray/valarray.cons/size.pass.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-// <valarray>
-
-// template<class T> class valarray;
-
-// explicit valarray(size_t);
-
-#include <valarray>
-#include <cassert>
-
-int main()
-{
-    {
-        std::valarray<int> v(100);
-        assert(v.size() == 100);
-        for (int i = 0; i < 100; ++i)
-            assert(v[i] == 0);
-    }
-    {
-        std::valarray<double> v(100);
-        assert(v.size() == 100);
-        for (int i = 0; i < 100; ++i)
-            assert(v[i] == 0);
-    }
-    {
-        std::valarray<std::valarray<double> > v(100);
-        assert(v.size() == 100);
-        for (int i = 0; i < 100; ++i)
-            assert(v[i].size() == 0);
-    }
-}
diff --git a/libcxx/test/numerics/numarray/template.valarray/valarray.cons/slice_array.pass.cpp b/libcxx/test/numerics/numarray/template.valarray/valarray.cons/slice_array.pass.cpp
deleted file mode 100644
index b676414140c..00000000000
--- a/libcxx/test/numerics/numarray/template.valarray/valarray.cons/slice_array.pass.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-// <valarray>
-
-// template<class T> class valarray;
-
-// valarray(const slice_array<value_type>& sa);
-
-#include <valarray>
-#include <cassert>
-
-int main()
-{
-    int a[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15};
-    std::valarray<int> v1(a, sizeof(a)/sizeof(a[0]));
-    std::valarray<int> v(v1[std::slice(1, 5, 3)]);
-    assert(v.size() == 5);
-    assert(v[0] == 1);
-    assert(v[1] == 4);
-    assert(v[2] == 7);
-    assert(v[3] == 10);
-    assert(v[4] == 13);
-}
diff --git a/libcxx/test/numerics/numarray/template.valarray/valarray.cons/value_size.pass.cpp b/libcxx/test/numerics/numarray/template.valarray/valarray.cons/value_size.pass.cpp
deleted file mode 100644
index 336c898b548..00000000000
--- a/libcxx/test/numerics/numarray/template.valarray/valarray.cons/value_size.pass.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-// <valarray>
-
-// template<class T> class valarray;
-
-// valarray(const value_type& x, size_t n);
-
-#include <valarray>
-#include <cassert>
-
-int main()
-{
-    {
-        std::valarray<int> v(5, 100);
-        assert(v.size() == 100);
-        for (int i = 0; i < 100; ++i)
-            assert(v[i] == 5);
-    }
-    {
-        std::valarray<double> v(2.5, 100);
-        assert(v.size() == 100);
-        for (int i = 0; i < 100; ++i)
-            assert(v[i] == 2.5);
-    }
-    {
-        std::valarray<std::valarray<double> > v(std::valarray<double>(10), 100);
-        assert(v.size() == 100);
-        for (int i = 0; i < 100; ++i)
-            assert(v[i].size() == 10);
-    }
-}
diff --git a/libcxx/test/numerics/numarray/template.valarray/valarray.members/apply_cref.pass.cpp b/libcxx/test/numerics/numarray/template.valarray/valarray.members/apply_cref.pass.cpp
deleted file mode 100644
index 919a3a5e499..00000000000
--- a/libcxx/test/numerics/numarray/template.valarray/valarray.members/apply_cref.pass.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-// <valarray>
-
-// template<class T> class valarray;
-
-// valarray apply(value_type f(const value_type&)) const;
-
-#include <valarray>
-#include <cassert>
-
-typedef int T;
-
-T f(const T& t) {return t + 5;}
-
-int main()
-{
-    {
-        T a1[] = {1, 2, 3, 4,  5,  6,  7,  8,  9, 10};
-        T a2[] = {6, 7, 8, 9, 10, 11, 12, 13, 14, 15};
-        const unsigned N1 = sizeof(a1)/sizeof(a1[0]);
-        std::valarray<T> v1(a1, N1);
-        std::valarray<T> v2 = v1.apply(f);
-        assert(v2.size() == N1);
-        for (unsigned i = 0; i < N1; ++i)
-            assert(v2[i] == a2[i]);
-    }
-    {
-        const unsigned N1 = 0;
-        std::valarray<T> v1;
-        std::valarray<T> v2 = v1.apply(f);
-        assert(v2.size() == N1);
-    }
-    {
-        T a1[] = {1, 2, 3, 4,  5,  6,  7,  8,  9, 10};
-        T a2[] = {7, 9, 11, 13, 15, 17, 19, 21, 23, 25};
-        const unsigned N1 = sizeof(a1)/sizeof(a1[0]);
-        std::valarray<T> v1(a1, N1);
-        std::valarray<T> v2 = (v1+v1).apply(f);
-        assert(v2.size() == N1);
-        for (unsigned i = 0; i < N1; ++i)
-            assert(v2[i] == a2[i]);
-    }
-}
diff --git a/libcxx/test/numerics/numarray/template.valarray/valarray.members/apply_value.pass.cpp b/libcxx/test/numerics/numarray/template.valarray/valarray.members/apply_value.pass.cpp
deleted file mode 100644
index dc7a1a100a2..00000000000
--- a/libcxx/test/numerics/numarray/template.valarray/valarray.members/apply_value.pass.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-// <valarray>
-
-// template<class T> class valarray;
-
-// valarray apply(value_type f(value_type)) const;
-
-#include <valarray>
-#include <cassert>
-
-typedef int T;
-
-T f(T t) {return t + 5;}
-
-int main()
-{
-    {
-        T a1[] = {1, 2, 3, 4,  5,  6,  7,  8,  9, 10};
-        T a2[] = {6, 7, 8, 9, 10, 11, 12, 13, 14, 15};
-        const unsigned N1 = sizeof(a1)/sizeof(a1[0]);
-        std::valarray<T> v1(a1, N1);
-        std::valarray<T> v2 = v1.apply(f);
-        assert(v2.size() == N1);
-        for (unsigned i = 0; i < N1; ++i)
-            assert(v2[i] == a2[i]);
-    }
-    {
-        const unsigned N1 = 0;
-        std::valarray<T> v1;
-        std::valarray<T> v2 = v1.apply(f);
-        assert(v2.size() == N1);
-    }
-    {
-        T a1[] = {1, 2, 3, 4,  5,  6,  7,  8,  9, 10};
-        T a2[] = {7, 9, 11, 13, 15, 17, 19, 21, 23, 25};
-        const unsigned N1 = sizeof(a1)/sizeof(a1[0]);
-        std::valarray<T> v1(a1, N1);
-        std::valarray<T> v2 = (v1+v1).apply(f);
-        assert(v2.size() == N1);
-        for (unsigned i = 0; i < N1; ++i)
-            assert(v2[i] == a2[i]);
-    }
-}
diff --git a/libcxx/test/numerics/numarray/template.valarray/valarray.members/cshift.pass.cpp b/libcxx/test/numerics/numarray/template.valarray/valarray.members/cshift.pass.cpp
deleted file mode 100644
index 601a6df8d5e..00000000000
--- a/libcxx/test/numerics/numarray/template.valarray/valarray.members/cshift.pass.cpp
+++ /dev/null
@@ -1,127 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-// <valarray>
-
-// template<class T> class valarray;
-
-// valarray cshift(int i) const;
-
-#include <valarray>
-#include <cassert>
-
-int main()
-{
-    {
-        typedef int T;
-        T a1[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10};
-        T a2[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10};
-        const unsigned N1 = sizeof(a1)/sizeof(a1[0]);
-        std::valarray<T> v1(a1, N1);
-        std::valarray<T> v2 = v1.cshift(0);
-        assert(v2.size() == N1);
-        for (unsigned i = 0; i < N1; ++i)
-            assert(v2[i] == a2[i]);
-    }
-    {
-        typedef int T;
-        T a1[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10};
-        T a2[] = {4, 5, 6, 7, 8, 9, 10, 1, 2, 3};
-        const unsigned N1 = sizeof(a1)/sizeof(a1[0]);
-        std::valarray<T> v1(a1, N1);
-        std::valarray<T> v2 = v1.cshift(3);
-        assert(v2.size() == N1);
-        for (unsigned i = 0; i < N1; ++i)
-            assert(v2[i] == a2[i]);
-    }
-    {
-        typedef int T;
-        T a1[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10};
-        T a2[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10};
-        const unsigned N1 = sizeof(a1)/sizeof(a1[0]);
-        std::valarray<T> v1(a1, N1);
-        std::valarray<T> v2 = v1.cshift(10);
-        assert(v2.size() == N1);
-        for (unsigned i = 0; i < N1; ++i)
-            assert(v2[i] == a2[i]);
-    }
-    {
-        typedef int T;
-        T a1[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10};
-        T a2[] = {8, 9, 10, 1, 2, 3, 4, 5, 6, 7};
-        const unsigned N1 = sizeof(a1)/sizeof(a1[0]);
-        std::valarray<T> v1(a1, N1);
-        std::valarray<T> v2 = v1.cshift(17);
-        assert(v2.size() == N1);
-        for (unsigned i = 0; i < N1; ++i)
-            assert(v2[i] == a2[i]);
-    }
-    {
-        typedef int T;
-        T a1[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10};
-        T a2[] = {8, 9, 10, 1, 2, 3, 4, 5, 6, 7};
-        const unsigned N1 = sizeof(a1)/sizeof(a1[0]);
-        std::valarray<T> v1(a1, N1);
-        std::valarray<T> v2 = v1.cshift(-3);
-        assert(v2.size() == N1);
-        for (unsigned i = 0; i < N1; ++i)
-            assert(v2[i] == a2[i]);
-    }
-    {
-        typedef int T;
-        T a1[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10};
-        T a2[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10};
-        const unsigned N1 = sizeof(a1)/sizeof(a1[0]);
-        std::valarray<T> v1(a1, N1);
-        std::valarray<T> v2 = v1.cshift(-10);
-        assert(v2.size() == N1);
-        for (unsigned i = 0; i < N1; ++i)
-            assert(v2[i] == a2[i]);
-    }
-    {
-        typedef int T;
-        T a1[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10};
-        T a2[] = {4, 5, 6, 7, 8, 9, 10, 1, 2, 3};
-        const unsigned N1 = sizeof(a1)/sizeof(a1[0]);
-        std::valarray<T> v1(a1, N1);
-        std::valarray<T> v2 = v1.cshift(-17);
-        assert(v2.size() == N1);
-        for (unsigned i = 0; i < N1; ++i)
-            assert(v2[i] == a2[i]);
-    }
-    {
-        typedef int T;
-        const unsigned N1 = 0;
-        std::valarray<T> v1;
-        std::valarray<T> v2 = v1.cshift(-17);
-        assert(v2.size() == N1);
-    }
-    {
-        typedef int T;
-        T a1[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10};
-        T a2[] = {8, 10, 12, 14, 16, 18, 20, 2, 4, 6};
-        const unsigned N1 = sizeof(a1)/sizeof(a1[0]);
-        std::valarray<T> v1(a1, N1);
-        std::valarray<T> v2 = (v1 + v1).cshift(3);
-        assert(v2.size() == N1);
-        for (unsigned i = 0; i < N1; ++i)
-            assert(v2[i] == a2[i]);
-    }
-    {
-        typedef int T;
-        T a1[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10};
-        T a2[] = {16, 18, 20, 2, 4, 6, 8, 10, 12, 14};
-        const unsigned N1 = sizeof(a1)/sizeof(a1[0]);
-        std::valarray<T> v1(a1, N1);
-        std::valarray<T> v2 = (v1 + v1).cshift(-3);
-        assert(v2.size() == N1);
-        for (unsigned i = 0; i < N1; ++i)
-            assert(v2[i] == a2[i]);
-    }
-}
diff --git a/libcxx/test/numerics/numarray/template.valarray/valarray.members/max.pass.cpp b/libcxx/test/numerics/numarray/template.valarray/valarray.members/max.pass.cpp
deleted file mode 100644
index 697d4cd19ed..00000000000
--- a/libcxx/test/numerics/numarray/template.valarray/valarray.members/max.pass.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-// <valarray>
-
-// template<class T> class valarray;
-
-// value_type max() const;
-
-#include <valarray>
-#include <cassert>
-
-int main()
-{
-    {
-        typedef double T;
-        T a1[] = {1.5, 2.5, -3, 4, -5.5};
-        const unsigned N1 = sizeof(a1)/sizeof(a1[0]);
-        std::valarray<T> v1(a1, N1);
-        assert(v1.max() == 4.0);
-    }
-    {
-        typedef double T;
-        std::valarray<T> v1;
-        v1.max();
-    }
-    {
-        typedef double T;
-        T a1[] = {1.5, 2.5, -3, 4, -5.5};
-        const unsigned N1 = sizeof(a1)/sizeof(a1[0]);
-        std::valarray<T> v1(a1, N1);
-        assert((2*v1).max() == 8.0);
-    }
-}
diff --git a/libcxx/test/numerics/numarray/template.valarray/valarray.members/min.pass.cpp b/libcxx/test/numerics/numarray/template.valarray/valarray.members/min.pass.cpp
deleted file mode 100644
index dac59343715..00000000000
--- a/libcxx/test/numerics/numarray/template.valarray/valarray.members/min.pass.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-// <valarray>
-
-// template<class T> class valarray;
-
-// value_type min() const;
-
-#include <valarray>
-#include <cassert>
-
-int main()
-{
-    {
-        typedef double T;
-        T a1[] = {1.5, 2.5, -3, 4, 5.5};
-        const unsigned N1 = sizeof(a1)/sizeof(a1[0]);
-        std::valarray<T> v1(a1, N1);
-        assert(v1.min() == -3.0);
-    }
-    {
-        typedef double T;
-        std::valarray<T> v1;
-        v1.min();
-    }
-    {
-        typedef double T;
-        T a1[] = {1.5, 2.5, -3, 4, 5.5};
-        const unsigned N1 = sizeof(a1)/sizeof(a1[0]);
-        std::valarray<T> v1(a1, N1);
-        assert((2*v1).min() == -6.0);
-    }
-}
diff --git a/libcxx/test/numerics/numarray/template.valarray/valarray.members/resize.pass.cpp b/libcxx/test/numerics/numarray/template.valarray/valarray.members/resize.pass.cpp
deleted file mode 100644
index 176d958aab9..00000000000
--- a/libcxx/test/numerics/numarray/template.valarray/valarray.members/resize.pass.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-// <valarray>
-
-// template<class T> class valarray;
-
-// void resize(size_t n, value_type x = value_type());
-
-#include <valarray>
-#include <cassert>
-
-int main()
-{
-    {
-        typedef int T;
-        T a1[] = {1, 2, 3, 4, 5};
-        const unsigned N1 = sizeof(a1)/sizeof(a1[0]);
-        std::valarray<T> v1(a1, N1);
-        v1.resize(8);
-        assert(v1.size() == 8);
-        for (int i = 0; i < v1.size(); ++i)
-            assert(v1[i] == 0);
-        v1.resize(0);
-        assert(v1.size() == 0);
-        v1.resize(80);
-        assert(v1.size() == 80);
-        for (int i = 0; i < v1.size(); ++i)
-            assert(v1[i] == 0);
-        v1.resize(40);
-        assert(v1.size() == 40);
-        for (int i = 0; i < v1.size(); ++i)
-            assert(v1[i] == 0);
-    }
-}
diff --git a/libcxx/test/numerics/numarray/template.valarray/valarray.members/shift.pass.cpp b/libcxx/test/numerics/numarray/template.valarray/valarray.members/shift.pass.cpp
deleted file mode 100644
index 9a617a91a41..00000000000
--- a/libcxx/test/numerics/numarray/template.valarray/valarray.members/shift.pass.cpp
+++ /dev/null
@@ -1,127 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-// <valarray>
-
-// template<class T> class valarray;
-
-// valarray shift(int i) const;
-
-#include <valarray>
-#include <cassert>
-
-int main()
-{
-    {
-        typedef int T;
-        T a1[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10};
-        T a2[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10};
-        const unsigned N1 = sizeof(a1)/sizeof(a1[0]);
-        std::valarray<T> v1(a1, N1);
-        std::valarray<T> v2 = v1.shift(0);
-        assert(v2.size() == N1);
-        for (unsigned i = 0; i < N1; ++i)
-            assert(v2[i] == a2[i]);
-    }
-    {
-        typedef int T;
-        T a1[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10};
-        T a2[] = {2, 3, 4, 5, 6, 7, 8, 9, 10, 0};
-        const unsigned N1 = sizeof(a1)/sizeof(a1[0]);
-        std::valarray<T> v1(a1, N1);
-        std::valarray<T> v2 = v1.shift(1);
-        assert(v2.size() == N1);
-        for (unsigned i = 0; i < N1; ++i)
-            assert(v2[i] == a2[i]);
-    }
-    {
-        typedef int T;
-        T a1[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10};
-        T a2[] = {10, 0, 0, 0, 0, 0, 0, 0, 0, 0};
-        const unsigned N1 = sizeof(a1)/sizeof(a1[0]);
-        std::valarray<T> v1(a1, N1);
-        std::valarray<T> v2 = v1.shift(9);
-        assert(v2.size() == N1);
-        for (unsigned i = 0; i < N1; ++i)
-            assert(v2[i] == a2[i]);
-    }
-    {
-        typedef int T;
-        T a1[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10};
-        T a2[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
-        const unsigned N1 = sizeof(a1)/sizeof(a1[0]);
-        std::valarray<T> v1(a1, N1);
-        std::valarray<T> v2 = v1.shift(90);
-        assert(v2.size() == N1);
-        for (unsigned i = 0; i < N1; ++i)
-            assert(v2[i] == a2[i]);
-    }
-    {
-        typedef int T;
-        T a1[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10};
-        T a2[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
-        const unsigned N1 = sizeof(a1)/sizeof(a1[0]);
-        std::valarray<T> v1(a1, N1);
-        std::valarray<T> v2 = v1.shift(-1);
-        assert(v2.size() == N1);
-        for (unsigned i = 0; i < N1; ++i)
-            assert(v2[i] == a2[i]);
-    }
-    {
-        typedef int T;
-        T a1[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10};
-        T a2[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1};
-        const unsigned N1 = sizeof(a1)/sizeof(a1[0]);
-        std::valarray<T> v1(a1, N1);
-        std::valarray<T> v2 = v1.shift(-9);
-        assert(v2.size() == N1);
-        for (unsigned i = 0; i < N1; ++i)
-            assert(v2[i] == a2[i]);
-    }
-    {
-        typedef int T;
-        T a1[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10};
-        T a2[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
-        const unsigned N1 = sizeof(a1)/sizeof(a1[0]);
-        std::valarray<T> v1(a1, N1);
-        std::valarray<T> v2 = v1.shift(-90);
-        assert(v2.size() == N1);
-        for (unsigned i = 0; i < N1; ++i)
-            assert(v2[i] == a2[i]);
-    }
-    {
-        typedef int T;
-        const unsigned N1 = 0;
-        std::valarray<T> v1;
-        std::valarray<T> v2 = v1.shift(-90);
-        assert(v2.size() == N1);
-    }
-    {
-        typedef int T;
-        T a1[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10};
-        T a2[] = {8, 10, 12, 14, 16, 18, 20, 0, 0, 0};
-        const unsigned N1 = sizeof(a1)/sizeof(a1[0]);
-        std::valarray<T> v1(a1, N1);
-        std::valarray<T> v2 = (v1 + v1).shift(3);
-        assert(v2.size() == N1);
-        for (unsigned i = 0; i < N1; ++i)
-            assert(v2[i] == a2[i]);
-    }
-    {
-        typedef int T;
-        T a1[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10};
-        T a2[] = {0, 0, 0, 2, 4, 6, 8, 10, 12, 14};
-        const unsigned N1 = sizeof(a1)/sizeof(a1[0]);
-        std::valarray<T> v1(a1, N1);
-        std::valarray<T> v2 = (v1 + v1).shift(-3);
-        assert(v2.size() == N1);
-        for (unsigned i = 0; i < N1; ++i)
-            assert(v2[i] == a2[i]);
-    }
-}
diff --git a/libcxx/test/numerics/numarray/template.valarray/valarray.members/size.pass.cpp b/libcxx/test/numerics/numarray/template.valarray/valarray.members/size.pass.cpp
deleted file mode 100644
index 0aae5b8de7f..00000000000
--- a/libcxx/test/numerics/numarray/template.valarray/valarray.members/size.pass.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-// <valarray>
-
-// template<class T> class valarray;
-
-// size_t size() const;
-
-#include <valarray>
-#include <cassert>
-
-int main()
-{
-    {
-        typedef int T;
-        T a1[] = {1, 2, 3, 4, 5};
-        const unsigned N1 = sizeof(a1)/sizeof(a1[0]);
-        std::valarray<T> v1(a1, N1);
-        assert(v1.size() == N1);
-    }
-    {
-        typedef int T;
-        T a1[] = {1, 2, 3, 4, 5};
-        const unsigned N1 = 0;
-        std::valarray<T> v1(a1, N1);
-        assert(v1.size() == N1);
-    }
-    {
-        typedef int T;
-        const unsigned N1 = 0;
-        std::valarray<T> v1;
-        assert(v1.size() == N1);
-    }
-}
diff --git a/libcxx/test/numerics/numarray/template.valarray/valarray.members/sum.pass.cpp b/libcxx/test/numerics/numarray/template.valarray/valarray.members/sum.pass.cpp
deleted file mode 100644
index 189f03d25cf..00000000000
--- a/libcxx/test/numerics/numarray/template.valarray/valarray.members/sum.pass.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-// <valarray>
-
-// template<class T> class valarray;
-
-// value_type sum() const;
-
-#include <valarray>
-#include <cassert>
-
-int main()
-{
-    {
-        typedef double T;
-        T a1[] = {1.5, 2.5, 3, 4, 5.5};
-        const unsigned N1 = sizeof(a1)/sizeof(a1[0]);
-        std::valarray<T> v1(a1, N1);
-        assert(v1.sum() == 16.5);
-    }
-}
diff --git a/libcxx/test/numerics/numarray/template.valarray/valarray.members/swap.pass.cpp b/libcxx/test/numerics/numarray/template.valarray/valarray.members/swap.pass.cpp
deleted file mode 100644
index a90a8093637..00000000000
--- a/libcxx/test/numerics/numarray/template.valarray/valarray.members/swap.pass.cpp
+++ /dev/null
@@ -1,89 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-// <valarray>
-
-// template<class T> class valarray;
-
-// void swap(valarray& v);
-
-#include <valarray>
-#include <cassert>
-
-int main()
-{
-    {
-        typedef int T;
-        T a1[] = {1, 2, 3, 4, 5};
-        T a2[] = {6, 7, 8, 9, 10, 11, 12};
-        const unsigned N1 = sizeof(a1)/sizeof(a1[0]);
-        const unsigned N2 = sizeof(a2)/sizeof(a2[0]);
-        std::valarray<T> v1(a1, N1);
-        std::valarray<T> v2(a2, N2);
-        std::valarray<T> v1_save = v1;
-        std::valarray<T> v2_save = v2;
-        v1.swap(v2);
-        assert(v1.size() == v2_save.size());
-        for (int i = 0; i < v1.size(); ++i)
-            assert(v1[i] == v2_save[i]);
-        assert(v2.size() == v1_save.size());
-        for (int i = 0; i < v2.size(); ++i)
-            assert(v2[i] == v1_save[i]);
-    }
-    {
-        typedef int T;
-        T a1[] = {1, 2, 3, 4, 5};
-        const unsigned N1 = sizeof(a1)/sizeof(a1[0]);
-        const unsigned N2 = 0;
-        std::valarray<T> v1(a1, N1);
-        std::valarray<T> v2;
-        std::valarray<T> v1_save = v1;
-        std::valarray<T> v2_save = v2;
-        v1.swap(v2);
-        assert(v1.size() == v2_save.size());
-        for (int i = 0; i < v1.size(); ++i)
-            assert(v1[i] == v2_save[i]);
-        assert(v2.size() == v1_save.size());
-        for (int i = 0; i < v2.size(); ++i)
-            assert(v2[i] == v1_save[i]);
-    }
-    {
-        typedef int T;
-        T a2[] = {6, 7, 8, 9, 10, 11, 12};
-        const unsigned N1 = 0;
-        const unsigned N2 = sizeof(a2)/sizeof(a2[0]);
-        std::valarray<T> v1;
-        std::valarray<T> v2(a2, N2);
-        std::valarray<T> v1_save = v1;
-        std::valarray<T> v2_save = v2;
-        v1.swap(v2);
-        assert(v1.size() == v2_save.size());
-        for (int i = 0; i < v1.size(); ++i)
-            assert(v1[i] == v2_save[i]);
-        assert(v2.size() == v1_save.size());
-        for (int i = 0; i < v2.size(); ++i)
-            assert(v2[i] == v1_save[i]);
-    }
-    {
-        typedef int T;
-        const unsigned N1 = 0;
-        const unsigned N2 = 0;
-        std::valarray<T> v1;
-        std::valarray<T> v2;
-        std::valarray<T> v1_save = v1;
-        std::valarray<T> v2_save = v2;
-        v1.swap(v2);
-        assert(v1.size() == v2_save.size());
-        for (int i = 0; i < v1.size(); ++i)
-            assert(v1[i] == v2_save[i]);
-        assert(v2.size() == v1_save.size());
-        for (int i = 0; i < v2.size(); ++i)
-            assert(v2[i] == v1_save[i]);
-    }
-}
diff --git a/libcxx/test/numerics/numarray/template.valarray/valarray.sub/gslice_const.pass.cpp b/libcxx/test/numerics/numarray/template.valarray/valarray.sub/gslice_const.pass.cpp
deleted file mode 100644
index 7bbd48c3453..00000000000
--- a/libcxx/test/numerics/numarray/template.valarray/valarray.sub/gslice_const.pass.cpp
+++ /dev/null
@@ -1,77 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-// <valarray>
-
-// template<class T> class valarray;
-
-// gslice_array<value_type> operator[](const gslice& gs);
-
-#include <valarray>
-#include <cassert>
-
-int main()
-{
-    int a1[] = { 0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11,
-                12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23,
-                24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35,
-                36, 37, 38, 39, 40};
-    int a2[] = { -0,  -1,  -2,  -3,  -4,  -5,  -6,  -7,  -8,  -9, -10, -11,
-                -12, -13, -14, -15, -16, -17, -18, -19, -20, -21, -22, -23};
-    std::valarray<int> v1(a1, sizeof(a1)/sizeof(a1[0]));
-    std::valarray<int> v2(a2, sizeof(a2)/sizeof(a2[0]));
-    std::size_t sz[] = {2, 4, 3};
-    std::size_t st[] = {19, 4, 1};
-    typedef std::valarray<std::size_t> sizes;
-    typedef std::valarray<std::size_t> strides;
-    v1[std::gslice(3, sizes(sz, sizeof(sz)/sizeof(sz[0])),
-                      strides(st, sizeof(st)/sizeof(st[0])))] = v2;
-    assert(v1.size() == 41);
-    assert(v1[ 0] ==  0);
-    assert(v1[ 1] ==  1);
-    assert(v1[ 2] ==  2);
-    assert(v1[ 3] ==  0);
-    assert(v1[ 4] == -1);
-    assert(v1[ 5] == -2);
-    assert(v1[ 6] ==  6);
-    assert(v1[ 7] == -3);
-    assert(v1[ 8] == -4);
-    assert(v1[ 9] == -5);
-    assert(v1[10] == 10);
-    assert(v1[11] == -6);
-    assert(v1[12] == -7);
-    assert(v1[13] == -8);
-    assert(v1[14] == 14);
-    assert(v1[15] == -9);
-    assert(v1[16] == -10);
-    assert(v1[17] == -11);
-    assert(v1[18] == 18);
-    assert(v1[19] == 19);
-    assert(v1[20] == 20);
-    assert(v1[21] == 21);
-    assert(v1[22] == -12);
-    assert(v1[23] == -13);
-    assert(v1[24] == -14);
-    assert(v1[25] == 25);
-    assert(v1[26] == -15);
-    assert(v1[27] == -16);
-    assert(v1[28] == -17);
-    assert(v1[29] == 29);
-    assert(v1[30] == -18);
-    assert(v1[31] == -19);
-    assert(v1[32] == -20);
-    assert(v1[33] == 33);
-    assert(v1[34] == -21);
-    assert(v1[35] == -22);
-    assert(v1[36] == -23);
-    assert(v1[37] == 37);
-    assert(v1[38] == 38);
-    assert(v1[39] == 39);
-    assert(v1[40] == 40);
-}
diff --git a/libcxx/test/numerics/numarray/template.valarray/valarray.sub/gslice_non_const.pass.cpp b/libcxx/test/numerics/numarray/template.valarray/valarray.sub/gslice_non_const.pass.cpp
deleted file mode 100644
index 282dcf1f6db..00000000000
--- a/libcxx/test/numerics/numarray/template.valarray/valarray.sub/gslice_non_const.pass.cpp
+++ /dev/null
@@ -1,57 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-// <valarray>
-
-// template<class T> class valarray;
-
-// valarray operator[](const gslice& gs) const;
-
-#include <valarray>
-#include <cassert>
-
-int main()
-{
-    int a[] = { 0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11,
-               12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23,
-               24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35,
-               36, 37, 38, 39, 40};
-    std::valarray<int> v1(a, sizeof(a)/sizeof(a[0]));
-    std::size_t sz[] = {2, 4, 3};
-    std::size_t st[] = {19, 4, 1};
-    typedef std::valarray<std::size_t> sizes;
-    typedef std::valarray<std::size_t> strides;
-    std::valarray<int> v(v1[std::gslice(3, sizes(sz, sizeof(sz)/sizeof(sz[0])),
-                                         strides(st, sizeof(st)/sizeof(st[0])))]);
-    assert(v.size() == 24);
-    assert(v[ 0] ==  3);
-    assert(v[ 1] ==  4);
-    assert(v[ 2] ==  5);
-    assert(v[ 3] ==  7);
-    assert(v[ 4] ==  8);
-    assert(v[ 5] ==  9);
-    assert(v[ 6] == 11);
-    assert(v[ 7] == 12);
-    assert(v[ 8] == 13);
-    assert(v[ 9] == 15);
-    assert(v[10] == 16);
-    assert(v[11] == 17);
-    assert(v[12] == 22);
-    assert(v[13] == 23);
-    assert(v[14] == 24);
-    assert(v[15] == 26);
-    assert(v[16] == 27);
-    assert(v[17] == 28);
-    assert(v[18] == 30);
-    assert(v[19] == 31);
-    assert(v[20] == 32);
-    assert(v[21] == 34);
-    assert(v[22] == 35);
-    assert(v[23] == 36);
-}
diff --git a/libcxx/test/numerics/numarray/template.valarray/valarray.sub/indirect_array_const.pass.cpp b/libcxx/test/numerics/numarray/template.valarray/valarray.sub/indirect_array_const.pass.cpp
deleted file mode 100644
index 1bc4fb92900..00000000000
--- a/libcxx/test/numerics/numarray/template.valarray/valarray.sub/indirect_array_const.pass.cpp
+++ /dev/null
@@ -1,57 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-// <valarray>
-
-// template<class T> class valarray;
-
-// valarray operator[](const valarray<size_t>& vs) const;
-
-#include <valarray>
-#include <cassert>
-
-int main()
-{
-    int a[] = { 0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11,
-               12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23,
-               24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35,
-               36, 37, 38, 39, 40};
-    const std::size_t N1 = sizeof(a)/sizeof(a[0]);
-    std::size_t s[] = { 3,  4,  5,  7,  8,  9, 11, 12, 13, 15, 16, 17,
-                       22, 23, 24, 26, 27, 28, 30, 31, 32, 34, 35, 36};
-    const std::size_t S = sizeof(s)/sizeof(s[0]);
-    const std::valarray<int> v1(a, N1);
-    std::valarray<std::size_t> ia(s, S);
-    std::valarray<int> v = v1[ia];
-    assert(v.size() == 24);
-    assert(v[ 0] ==  3);
-    assert(v[ 1] ==  4);
-    assert(v[ 2] ==  5);
-    assert(v[ 3] ==  7);
-    assert(v[ 4] ==  8);
-    assert(v[ 5] ==  9);
-    assert(v[ 6] == 11);
-    assert(v[ 7] == 12);
-    assert(v[ 8] == 13);
-    assert(v[ 9] == 15);
-    assert(v[10] == 16);
-    assert(v[11] == 17);
-    assert(v[12] == 22);
-    assert(v[13] == 23);
-    assert(v[14] == 24);
-    assert(v[15] == 26);
-    assert(v[16] == 27);
-    assert(v[17] == 28);
-    assert(v[18] == 30);
-    assert(v[19] == 31);
-    assert(v[20] == 32);
-    assert(v[21] == 34);
-    assert(v[22] == 35);
-    assert(v[23] == 36);
-}
diff --git a/libcxx/test/numerics/numarray/template.valarray/valarray.sub/indirect_array_non_const.pass.cpp b/libcxx/test/numerics/numarray/template.valarray/valarray.sub/indirect_array_non_const.pass.cpp
deleted file mode 100644
index d0b7438172e..00000000000
--- a/libcxx/test/numerics/numarray/template.valarray/valarray.sub/indirect_array_non_const.pass.cpp
+++ /dev/null
@@ -1,58 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-// <valarray>
-
-// template<class T> class valarray;
-
-// indirect_array<value_type> operator[](const valarray<size_t>& vs);
-
-#include <valarray>
-#include <cassert>
-
-int main()
-{
-    int a[] = { 0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11,
-               12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23,
-               24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35,
-               36, 37, 38, 39, 40};
-    const std::size_t N1 = sizeof(a)/sizeof(a[0]);
-    std::size_t s[] = { 3,  4,  5,  7,  8,  9, 11, 12, 13, 15, 16, 17,
-                       22, 23, 24, 26, 27, 28, 30, 31, 32, 34, 35, 36};
-    const std::size_t S = sizeof(s)/sizeof(s[0]);
-    std::valarray<int> v1(a, N1);
-    std::valarray<std::size_t> ia(s, S);
-    std::valarray<int> v(24);
-    v = v1[ia];
-    assert(v.size() == 24);
-    assert(v[ 0] ==  3);
-    assert(v[ 1] ==  4);
-    assert(v[ 2] ==  5);
-    assert(v[ 3] ==  7);
-    assert(v[ 4] ==  8);
-    assert(v[ 5] ==  9);
-    assert(v[ 6] == 11);
-    assert(v[ 7] == 12);
-    assert(v[ 8] == 13);
-    assert(v[ 9] == 15);
-    assert(v[10] == 16);
-    assert(v[11] == 17);
-    assert(v[12] == 22);
-    assert(v[13] == 23);
-    assert(v[14] == 24);
-    assert(v[15] == 26);
-    assert(v[16] == 27);
-    assert(v[17] == 28);
-    assert(v[18] == 30);
-    assert(v[19] == 31);
-    assert(v[20] == 32);
-    assert(v[21] == 34);
-    assert(v[22] == 35);
-    assert(v[23] == 36);
-}
diff --git a/libcxx/test/numerics/numarray/template.valarray/valarray.sub/slice_const.pass.cpp b/libcxx/test/numerics/numarray/template.valarray/valarray.sub/slice_const.pass.cpp
deleted file mode 100644
index 7f8191035e7..00000000000
--- a/libcxx/test/numerics/numarray/template.valarray/valarray.sub/slice_const.pass.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-// <valarray>
-
-// template<class T> class valarray;
-
-// valarray operator[](slice s) const;
-
-#include <valarray>
-#include <cassert>
-
-int main()
-{
-    int a1[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15};
-    std::valarray<int> v1(a1, sizeof(a1)/sizeof(a1[0]));
-    std::valarray<int> v2 = v1[std::slice(1, 5, 3)];
-    assert(v2.size() == 5);
-    assert(v2[0] ==  1);
-    assert(v2[1] ==  4);
-    assert(v2[2] ==  7);
-    assert(v2[3] == 10);
-    assert(v2[4] == 13);
-}
diff --git a/libcxx/test/numerics/numarray/template.valarray/valarray.sub/slice_non_const.pass.cpp b/libcxx/test/numerics/numarray/template.valarray/valarray.sub/slice_non_const.pass.cpp
deleted file mode 100644
index 6bf9b430ec8..00000000000
--- a/libcxx/test/numerics/numarray/template.valarray/valarray.sub/slice_non_const.pass.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-// <valarray>
-
-// template<class T> class valarray;
-
-// slice_array<value_type> operator[](slice s);
-
-#include <valarray>
-#include <cassert>
-
-int main()
-{
-    int a1[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15};
-    int a2[] = {-1, -2, -3, -4, -5};
-    std::valarray<int> v1(a1, sizeof(a1)/sizeof(a1[0]));
-    std::valarray<int> v2(a2, sizeof(a2)/sizeof(a2[0]));
-    v1[std::slice(1, 5, 3)] = v2;
-    assert(v1.size() == 16);
-    assert(v1[ 0] ==  0);
-    assert(v1[ 1] == -1);
-    assert(v1[ 2] ==  2);
-    assert(v1[ 3] ==  3);
-    assert(v1[ 4] == -2);
-    assert(v1[ 5] ==  5);
-    assert(v1[ 6] ==  6);
-    assert(v1[ 7] == -3);
-    assert(v1[ 8] ==  8);
-    assert(v1[ 9] ==  9);
-    assert(v1[10] == -4);
-    assert(v1[11] == 11);
-    assert(v1[12] == 12);
-    assert(v1[13] == -5);
-    assert(v1[14] == 14);
-    assert(v1[15] == 15);
-}
diff --git a/libcxx/test/numerics/numarray/template.valarray/valarray.sub/valarray_bool_const.pass.cpp b/libcxx/test/numerics/numarray/template.valarray/valarray.sub/valarray_bool_const.pass.cpp
deleted file mode 100644
index 10bdd82e553..00000000000
--- a/libcxx/test/numerics/numarray/template.valarray/valarray.sub/valarray_bool_const.pass.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-// <valarray>
-
-// template<class T> class valarray;
-
-// valarray operator[](const valarray<bool>& vb) const;
-
-#include <valarray>
-#include <cassert>
-
-int main()
-{
-    int a1[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15};
-    const std::size_t N1 = sizeof(a1)/sizeof(a1[0]);
-    bool b[N1] = {true,  false, false, true,  true,  false,
-                  false, true,  false, false, false, true};
-    std::valarray<int> v1(a1, N1);
-    std::valarray<bool> vb(b, N1);
-    std::valarray<int> v2(v1[vb]);
-    assert(v2.size() == 5);
-    assert(v2[ 0] ==  0);
-    assert(v2[ 1] ==  3);
-    assert(v2[ 2] ==  4);
-    assert(v2[ 3] ==  7);
-    assert(v2[ 4] == 11);
-}
diff --git a/libcxx/test/numerics/numarray/template.valarray/valarray.sub/valarray_bool_non_const.pass.cpp b/libcxx/test/numerics/numarray/template.valarray/valarray.sub/valarray_bool_non_const.pass.cpp
deleted file mode 100644
index cecf9502293..00000000000
--- a/libcxx/test/numerics/numarray/template.valarray/valarray.sub/valarray_bool_non_const.pass.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-// <valarray>
-
-// template<class T> class valarray;
-
-// mask_array<value_type> operator[](const valarray<bool>& vb);
-
-#include <valarray>
-#include <cassert>
-
-int main()
-{
-    int a1[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15};
-    const std::size_t N1 = sizeof(a1)/sizeof(a1[0]);
-    bool b[N1] = {true,  false, false, true,  true,  false,
-                  false, true,  false, false, false, true};
-    std::valarray<int> v1(a1, N1);
-    std::valarray<bool> vb(b, N1);
-    std::valarray<int> v2(5);
-    v2 = v1[vb];
-    assert(v2.size() == 5);
-    assert(v2[ 0] ==  0);
-    assert(v2[ 1] ==  3);
-    assert(v2[ 2] ==  4);
-    assert(v2[ 3] ==  7);
-    assert(v2[ 4] == 11);
-}
diff --git a/libcxx/test/numerics/numarray/template.valarray/valarray.unary/bit_not.pass.cpp b/libcxx/test/numerics/numarray/template.valarray/valarray.unary/bit_not.pass.cpp
deleted file mode 100644
index c1d240cb679..00000000000
--- a/libcxx/test/numerics/numarray/template.valarray/valarray.unary/bit_not.pass.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-// <valarray>
-
-// template<class T> class valarray;
-
-// valarray operator~() const;
-
-#include <valarray>
-#include <cassert>
-
-int main()
-{
-    {
-        typedef int T;
-        T a[] = {1, 2, 3, 4, 5};
-        const unsigned N = sizeof(a)/sizeof(a[0]);
-        std::valarray<T> v(a, N);
-        std::valarray<T> v2 = ~v;
-        assert(v2.size() == v.size());
-        for (int i = 0; i < v2.size(); ++i)
-            assert(v2[i] == ~v[i]);
-    }
-    {
-        typedef std::valarray<int> T;
-        T a[] = {T(1), T(2), T(3), T(4), T(5)};
-        const unsigned N = sizeof(a)/sizeof(a[0]);
-        std::valarray<T> v(a, N);
-        std::valarray<T> v2 = ~v;
-        assert(v2.size() == v.size());
-        for (int i = 0; i < N; ++i)
-        {
-            assert(v2[i].size() == v[i].size());
-            for (int j = 0; j < v[i].size(); ++j)
-                assert(v2[i][j] == ~v[i][j]);
-        }
-    }
-    {
-        typedef int T;
-        T a[] = {1, 2, 3, 4, 5};
-        const unsigned N = sizeof(a)/sizeof(a[0]);
-        std::valarray<T> v(a, N);
-        std::valarray<T> v2 = ~(v + v);
-        assert(v2.size() == v.size());
-        for (int i = 0; i < v2.size(); ++i)
-            assert(v2[i] == ~(2*v[i]));
-    }
-}
diff --git a/libcxx/test/numerics/numarray/template.valarray/valarray.unary/negate.pass.cpp b/libcxx/test/numerics/numarray/template.valarray/valarray.unary/negate.pass.cpp
deleted file mode 100644
index 25674bb44d9..00000000000
--- a/libcxx/test/numerics/numarray/template.valarray/valarray.unary/negate.pass.cpp
+++ /dev/null
@@ -1,65 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-// <valarray>
-
-// template<class T> class valarray;
-
-// valarray operator-() const;
-
-#include <valarray>
-#include <cassert>
-
-int main()
-{
-    {
-        typedef int T;
-        T a[] = {1, 2, 3, 4, 5};
-        const unsigned N = sizeof(a)/sizeof(a[0]);
-        std::valarray<T> v(a, N);
-        std::valarray<T> v2 = -v;
-        assert(v2.size() == v.size());
-        for (int i = 0; i < v2.size(); ++i)
-            assert(v2[i] == -v[i]);
-    }
-    {
-        typedef double T;
-        T a[] = {1, 2.5, 3, 4.25, 5};
-        const unsigned N = sizeof(a)/sizeof(a[0]);
-        std::valarray<T> v(a, N);
-        std::valarray<T> v2 = -v;
-        assert(v2.size() == v.size());
-        for (int i = 0; i < v2.size(); ++i)
-            assert(v2[i] == -v[i]);
-    }
-    {
-        typedef std::valarray<double> T;
-        T a[] = {T(1), T(2), T(3), T(4), T(5)};
-        const unsigned N = sizeof(a)/sizeof(a[0]);
-        std::valarray<T> v(a, N);
-        std::valarray<T> v2 = -v;
-        assert(v2.size() == v.size());
-        for (int i = 0; i < N; ++i)
-        {
-            assert(v2[i].size() == v[i].size());
-            for (int j = 0; j < v[i].size(); ++j)
-                assert(v2[i][j] == -v[i][j]);
-        }
-    }
-    {
-        typedef double T;
-        T a[] = {1, 2.5, 3, 4.25, 5};
-        const unsigned N = sizeof(a)/sizeof(a[0]);
-        std::valarray<T> v(a, N);
-        std::valarray<T> v2 = -(v + v);
-        assert(v2.size() == v.size());
-        for (int i = 0; i < v2.size(); ++i)
-            assert(v2[i] == -2*v[i]);
-    }
-}
diff --git a/libcxx/test/numerics/numarray/template.valarray/valarray.unary/not.pass.cpp b/libcxx/test/numerics/numarray/template.valarray/valarray.unary/not.pass.cpp
deleted file mode 100644
index 0b792c68fb9..00000000000
--- a/libcxx/test/numerics/numarray/template.valarray/valarray.unary/not.pass.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-// <valarray>
-
-// template<class T> class valarray;
-
-// valarray<bool> operator!() const;
-
-#include <valarray>
-#include <cassert>
-
-int main()
-{
-    {
-        typedef int T;
-        T a[] = {1, 2, 3, 4, 5};
-        const unsigned N = sizeof(a)/sizeof(a[0]);
-        std::valarray<T> v(a, N);
-        std::valarray<bool> v2 = !v;
-        assert(v2.size() == v.size());
-        for (int i = 0; i < v2.size(); ++i)
-            assert(v2[i] == !v[i]);
-    }
-    {
-        typedef double T;
-        T a[] = {1, 2.5, 3, 4.25, 5};
-        const unsigned N = sizeof(a)/sizeof(a[0]);
-        std::valarray<T> v(a, N);
-        std::valarray<bool> v2 = !(v + v);
-        assert(v2.size() == v.size());
-        for (int i = 0; i < v2.size(); ++i)
-            assert(v2[i] == !2*v[i]);
-    }
-}
diff --git a/libcxx/test/numerics/numarray/template.valarray/valarray.unary/plus.pass.cpp b/libcxx/test/numerics/numarray/template.valarray/valarray.unary/plus.pass.cpp
deleted file mode 100644
index 4bcdaf095ff..00000000000
--- a/libcxx/test/numerics/numarray/template.valarray/valarray.unary/plus.pass.cpp
+++ /dev/null
@@ -1,65 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-// <valarray>
-
-// template<class T> class valarray;
-
-// valarray operator+() const;
-
-#include <valarray>
-#include <cassert>
-
-int main()
-{
-    {
-        typedef int T;
-        T a[] = {1, 2, 3, 4, 5};
-        const unsigned N = sizeof(a)/sizeof(a[0]);
-        std::valarray<T> v(a, N);
-        std::valarray<T> v2 = +v;
-        assert(v2.size() == v.size());
-        for (int i = 0; i < v2.size(); ++i)
-            assert(v2[i] == +v[i]);
-    }
-    {
-        typedef double T;
-        T a[] = {1, 2.5, 3, 4.25, 5};
-        const unsigned N = sizeof(a)/sizeof(a[0]);
-        std::valarray<T> v(a, N);
-        std::valarray<T> v2 = +v;
-        assert(v2.size() == v.size());
-        for (int i = 0; i < v2.size(); ++i)
-            assert(v2[i] == +v[i]);
-    }
-    {
-        typedef std::valarray<double> T;
-        T a[] = {T(1), T(2), T(3), T(4), T(5)};
-        const unsigned N = sizeof(a)/sizeof(a[0]);
-        std::valarray<T> v(a, N);
-        std::valarray<T> v2 = +v;
-        assert(v2.size() == v.size());
-        for (int i = 0; i < N; ++i)
-        {
-            assert(v2[i].size() == v[i].size());
-            for (int j = 0; j < v[i].size(); ++j)
-                assert(v2[i][j] == +v[i][j]);
-        }
-    }
-    {
-        typedef double T;
-        T a[] = {1, 2.5, 3, 4.25, 5};
-        const unsigned N = sizeof(a)/sizeof(a[0]);
-        std::valarray<T> v(a, N);
-        std::valarray<T> v2 = +(v + v);
-        assert(v2.size() == v.size());
-        for (int i = 0; i < v2.size(); ++i)
-            assert(v2[i] == +2*v[i]);
-    }
-}