fixing tests

Author: tdegeus

test/test_xadapt.cpp

@@ -19,39 +19,55 @@ namespace xt
     TEST(xarray_adaptor, xarray_pointer)
     {
         std::vector<int> data(4, 0);
-        using shape_type = xt::svector<std::size_t>;
-        shape_type shape({2, 2});
-
+        xt::svector<std::size_t> shape = {2, 2};
         xt::xarray_pointer<int> a = xt::adapt(data.data(), data.size(), xt::no_ownership(), shape);
 
         a(0, 0) = 0;
         a(0, 1) = 1;
         a(1, 0) = 2;
         a(1, 1) = 3;
 
-        EXPECT_EQ(0, data[0]);
-        EXPECT_EQ(1, data[1]);
-        EXPECT_EQ(2, data[2]);
-        EXPECT_EQ(3, data[3]);
+        if (XTENSOR_DEFAULT_LAYOUT == xt::layout_type::row_major)
+        {
+            EXPECT_EQ(0, data[0]);
+            EXPECT_EQ(1, data[1]);
+            EXPECT_EQ(2, data[2]);
+            EXPECT_EQ(3, data[3]);
+        }
+        else
+        {
+            EXPECT_EQ(0, data[0]);
+            EXPECT_EQ(2, data[1]);
+            EXPECT_EQ(1, data[2]);
+            EXPECT_EQ(3, data[3]);
+        }
     }
 
     TEST(xtensor_adaptor, xtensor_pointer)
     {
         std::vector<int> data(4, 0);
-        using shape_type = std::array<std::size_t, 2>;
-        shape_type shape({2, 2});
-
+        std::array<std::size_t, 2> shape = {2, 2};
         xt::xtensor_pointer<int, 2> a = xt::adapt(data.data(), data.size(), xt::no_ownership(), shape);
 
         a(0, 0) = 0;
         a(0, 1) = 1;
         a(1, 0) = 2;
         a(1, 1) = 3;
 
-        EXPECT_EQ(0, data[0]);
-        EXPECT_EQ(1, data[1]);
-        EXPECT_EQ(2, data[2]);
-        EXPECT_EQ(3, data[3]);
+        if (XTENSOR_DEFAULT_LAYOUT == xt::layout_type::row_major)
+        {
+            EXPECT_EQ(0, data[0]);
+            EXPECT_EQ(1, data[1]);
+            EXPECT_EQ(2, data[2]);
+            EXPECT_EQ(3, data[3]);
+        }
+        else
+        {
+            EXPECT_EQ(0, data[0]);
+            EXPECT_EQ(2, data[1]);
+            EXPECT_EQ(1, data[2]);
+            EXPECT_EQ(3, data[3]);
+        }
     }
 
     TEST(xarray_adaptor, adapt)