2 files changed, 53 insertions, 18 deletions
diff --git a/libcxx/test/std/containers/sequences/array/array.tuple/tuple_element.pass.cpp b/libcxx/test/std/containers/sequences/array/array.tuple/tuple_element.pass.cpp
index cd1dad60ade..91d6b4e5da2 100644
--- a/libcxx/test/std/containers/sequences/array/array.tuple/tuple_element.pass.cpp
+++ b/libcxx/test/std/containers/sequences/array/array.tuple/tuple_element.pass.cpp
@@ -14,20 +14,41 @@
 #include <array>
 #include <type_traits>
 
-int main()
+template <class T>
+void test()
 {
     {
-        typedef double T;
-        typedef std::array<T, 3> C;
-        static_assert((std::is_same<std::tuple_element<0, C>::type, T>::value), "");
-        static_assert((std::is_same<std::tuple_element<1, C>::type, T>::value), "");
-        static_assert((std::is_same<std::tuple_element<2, C>::type, T>::value), "");
+    typedef T Exp;
+    typedef std::array<T, 3> C;
+    static_assert((std::is_same<typename std::tuple_element<0, C>::type, Exp>::value), "");
+    static_assert((std::is_same<typename std::tuple_element<1, C>::type, Exp>::value), "");
+    static_assert((std::is_same<typename std::tuple_element<2, C>::type, Exp>::value), "");
+    }
+    {
+    typedef T const Exp;
+    typedef std::array<T, 3> const C;
+    static_assert((std::is_same<typename std::tuple_element<0, C>::type, Exp>::value), "");
+    static_assert((std::is_same<typename std::tuple_element<1, C>::type, Exp>::value), "");
+    static_assert((std::is_same<typename std::tuple_element<2, C>::type, Exp>::value), "");
+    }
+    {
+    typedef T volatile Exp;
+    typedef std::array<T, 3> volatile C;
+    static_assert((std::is_same<typename std::tuple_element<0, C>::type, Exp>::value), "");
+    static_assert((std::is_same<typename std::tuple_element<1, C>::type, Exp>::value), "");
+    static_assert((std::is_same<typename std::tuple_element<2, C>::type, Exp>::value), "");
     }
     {
-        typedef int T;
-        typedef std::array<T, 3> C;
-        static_assert((std::is_same<std::tuple_element<0, C>::type, T>::value), "");
-        static_assert((std::is_same<std::tuple_element<1, C>::type, T>::value), "");
-        static_assert((std::is_same<std::tuple_element<2, C>::type, T>::value), "");
+    typedef T const volatile Exp;
+    typedef std::array<T, 3> const volatile C;
+    static_assert((std::is_same<typename std::tuple_element<0, C>::type, Exp>::value), "");
+    static_assert((std::is_same<typename std::tuple_element<1, C>::type, Exp>::value), "");
+    static_assert((std::is_same<typename std::tuple_element<2, C>::type, Exp>::value), "");
     }
 }
+
+int main()
+{
+    test<double>();
+    test<int>();
+}
diff --git a/libcxx/test/std/containers/sequences/array/array.tuple/tuple_size.pass.cpp b/libcxx/test/std/containers/sequences/array/array.tuple/tuple_size.pass.cpp
index 83394b1e0c9..1e565d1946e 100644
--- a/libcxx/test/std/containers/sequences/array/array.tuple/tuple_size.pass.cpp
+++ b/libcxx/test/std/containers/sequences/array/array.tuple/tuple_size.pass.cpp
@@ -13,16 +13,30 @@
 
 #include <array>
 
-int main()
+template <class T, std::size_t N>
+void test()
 {
     {
-        typedef double T;
-        typedef std::array<T, 3> C;
-        static_assert((std::tuple_size<C>::value == 3), "");
+    typedef std::array<T, N> C;
+    static_assert((std::tuple_size<C>::value == N), "");
+    }
+    {
+    typedef std::array<T const, N> C;
+    static_assert((std::tuple_size<C>::value == N), "");
+    }
+    {
+    typedef std::array<T volatile, N> C;
+    static_assert((std::tuple_size<C>::value == N), "");
     }
     {
-        typedef double T;
-        typedef std::array<T, 0> C;
-        static_assert((std::tuple_size<C>::value == 0), "");
+    typedef std::array<T const volatile, N> C;
+    static_assert((std::tuple_size<C>::value == N), "");
     }
 }
+
+int main()
+{
+    test<double, 0>();
+    test<double, 3>();
+    test<double, 5>();
+}