Merge pull request #91 from acki-m/bugfix-unittests-raspery-pi

Disabled unit tests where signed char is not supported (e.g. ARM)
rttrorg · Nov 5, 2017 · 8337042 · 8337042
2 parents 8628896 + bcb4135
commit 8337042
Show file tree

Hide file tree

Showing 10 changed files with 139 additions and 60 deletions.
diff --git a/src/unit_tests/variant/variant_conv_to_double.cpp b/src/unit_tests/variant/variant_conv_to_double.cpp
@@ -87,14 +87,22 @@ TEST_CASE("variant::to_double() - from char", "[variant]")
         CHECK(var.get_value<double>() == 65.0);
     }
 
-    SECTION("valid conversion negative")
+RTTR_BEGIN_DISABLE_CONDITIONAL_EXPR_WARNING
+
+    if (std::numeric_limits<char>::is_signed)
     {
-        variant var = char(-60);
-        bool ok = false;
-        CHECK(var.to_double(&ok) == -60.0);
-        CHECK(ok == true);
-        CHECK(var.convert(type::get<double>()) == true);
+        SECTION("valid conversion negative")
+        {
+            variant var = char(-60);
+            bool ok = false;
+            CHECK(var.to_double(&ok) == -60.0);
+            CHECK(ok == true);
+            CHECK(var.convert(type::get<double>()) == true);
+        }
     }
+
+RTTR_END_DISABLE_CONDITIONAL_EXPR_WARNING
+
 }
 
 /////////////////////////////////////////////////////////////////////////////////////////

diff --git a/src/unit_tests/variant/variant_conv_to_float.cpp b/src/unit_tests/variant/variant_conv_to_float.cpp
@@ -87,14 +87,22 @@ TEST_CASE("variant::to_float() - from char", "[variant]")
         CHECK(var.get_value<float>() == 65.0);
     }
 
-    SECTION("valid conversion negative")
+RTTR_BEGIN_DISABLE_CONDITIONAL_EXPR_WARNING
+
+    if (std::numeric_limits<char>::is_signed)
     {
-        variant var = char(-60);
-        bool ok = false;
-        CHECK(var.to_float(&ok) == -60.0);
-        CHECK(ok == true);
-        CHECK(var.convert(type::get<float>()) == true);
+        SECTION("valid conversion negative")
+        {
+            variant var = char(-60);
+            bool ok = false;
+            CHECK(var.to_float(&ok) == -60.0);
+            CHECK(ok == true);
+            CHECK(var.convert(type::get<float>()) == true);
+        }
     }
+
+RTTR_END_DISABLE_CONDITIONAL_EXPR_WARNING
+
 }
 
 /////////////////////////////////////////////////////////////////////////////////////////

diff --git a/src/unit_tests/variant/variant_conv_to_int16.cpp b/src/unit_tests/variant/variant_conv_to_int16.cpp
@@ -87,14 +87,22 @@ TEST_CASE("variant::to_int16() - from char", "[variant]")
         CHECK(var.get_value<int16_t>() == 65);
     }
 
-    SECTION("valid conversion negative")
+RTTR_BEGIN_DISABLE_CONDITIONAL_EXPR_WARNING
+
+    if (std::numeric_limits<char>::is_signed)
     {
-        variant var = char(-60);
-        bool ok = false;
-        CHECK(var.to_int16(&ok) == -60);
-        CHECK(ok == true);
-        CHECK(var.convert(type::get<int16_t>()) == true);
+        SECTION("valid conversion negative")
+        {
+            variant var = char(-60);
+            bool ok = false;
+            CHECK(var.to_int16(&ok) == -60);
+            CHECK(ok == true);
+            CHECK(var.convert(type::get<int16_t>()) == true);
+        }
     }
+
+RTTR_END_DISABLE_CONDITIONAL_EXPR_WARNING
+
 }
 
 /////////////////////////////////////////////////////////////////////////////////////////

diff --git a/src/unit_tests/variant/variant_conv_to_int32.cpp b/src/unit_tests/variant/variant_conv_to_int32.cpp
@@ -87,14 +87,22 @@ TEST_CASE("variant::to_int32() - from char", "[variant]")
         CHECK(var.get_value<int32_t>() == 65);
     }
 
-    SECTION("valid conversion negative")
+RTTR_BEGIN_DISABLE_CONDITIONAL_EXPR_WARNING
+
+    if (std::numeric_limits<char>::is_signed)
     {
-        variant var = char(-60);
-        bool ok = false;
-        CHECK(var.to_int32(&ok) == -60);
-        CHECK(ok == true);
-        CHECK(var.convert(type::get<int32_t>()) == true);
+        SECTION("valid conversion negative")
+        {
+            variant var = char(-60);
+            bool ok = false;
+            CHECK(var.to_int32(&ok) == -60);
+            CHECK(ok == true);
+            CHECK(var.convert(type::get<int32_t>()) == true);
+        }
     }
+
+RTTR_END_DISABLE_CONDITIONAL_EXPR_WARNING
+
 }
 
 /////////////////////////////////////////////////////////////////////////////////////////

diff --git a/src/unit_tests/variant/variant_conv_to_int64.cpp b/src/unit_tests/variant/variant_conv_to_int64.cpp
@@ -87,14 +87,22 @@ TEST_CASE("variant::to_int64() - from char", "[variant]")
         CHECK(var.get_value<int64_t>() == 65);
     }
 
-    SECTION("valid conversion negative")
+RTTR_BEGIN_DISABLE_CONDITIONAL_EXPR_WARNING
+
+    if (std::numeric_limits<char>::is_signed)
     {
-        variant var = char(-60);
-        bool ok = false;
-        CHECK(var.to_int64(&ok) == -60);
-        CHECK(ok == true);
-        CHECK(var.convert(type::get<int64_t>()) == true);
+        SECTION("valid conversion negative")
+        {
+            variant var = char(-60);
+            bool ok = false;
+            CHECK(var.to_int64(&ok) == -60);
+            CHECK(ok == true);
+            CHECK(var.convert(type::get<int64_t>()) == true);
+        }
     }
+
+RTTR_END_DISABLE_CONDITIONAL_EXPR_WARNING
+
 }
 
 /////////////////////////////////////////////////////////////////////////////////////////

diff --git a/src/unit_tests/variant/variant_conv_to_int8.cpp b/src/unit_tests/variant/variant_conv_to_int8.cpp
@@ -87,14 +87,21 @@ TEST_CASE("variant::to_int8() - from char", "[variant]")
         CHECK(var.get_value<int8_t>() == 65);
     }
 
-    SECTION("valid conversion negative")
+RTTR_BEGIN_DISABLE_CONDITIONAL_EXPR_WARNING
+
+    if (std::numeric_limits<char>::is_signed)
     {
-        variant var = char(-60);
-        bool ok = false;
-        CHECK(var.to_int8(&ok) == -60);
-        CHECK(ok == true);
-        CHECK(var.convert(type::get<int8_t>()) == true);
+        SECTION("valid conversion negative")
+        {
+            variant var = char(-60);
+            bool ok = false;
+            CHECK(var.to_int8(&ok) == -60);
+            CHECK(ok == true);
+            CHECK(var.convert(type::get<int8_t>()) == true);
+        }
     }
+
+RTTR_END_DISABLE_CONDITIONAL_EXPR_WARNING
 }
 
 /////////////////////////////////////////////////////////////////////////////////////////

diff --git a/src/unit_tests/variant/variant_conv_to_uint16.cpp b/src/unit_tests/variant/variant_conv_to_uint16.cpp
@@ -87,14 +87,22 @@ TEST_CASE("variant::to_uint16() - from char", "[variant]")
         CHECK(var.get_value<uint16_t>() == 65);
     }
 
-    SECTION("invalid conversion negative")
+RTTR_BEGIN_DISABLE_CONDITIONAL_EXPR_WARNING
+
+    if (std::numeric_limits<char>::is_signed)
     {
-        variant var = char(-60);
-        bool ok = false;
-        CHECK(var.to_uint16(&ok) == 0);
-        CHECK(ok == false);
-        CHECK(var.convert(type::get<uint16_t>()) == false);
+        SECTION("invalid conversion negative")
+        {
+            variant var = char(-60);
+            bool ok = false;
+            CHECK(var.to_uint16(&ok) == 0);
+            CHECK(ok == false);
+            CHECK(var.convert(type::get<uint16_t>()) == false);
+        }
     }
+
+RTTR_END_DISABLE_CONDITIONAL_EXPR_WARNING
+
 }
 
 /////////////////////////////////////////////////////////////////////////////////////////

diff --git a/src/unit_tests/variant/variant_conv_to_uint32.cpp b/src/unit_tests/variant/variant_conv_to_uint32.cpp
@@ -87,14 +87,22 @@ TEST_CASE("variant::to_uint32() - from char", "[variant]")
         CHECK(var.get_value<uint32_t>() == 65);
     }
 
-    SECTION("invalid conversion negative")
+RTTR_BEGIN_DISABLE_CONDITIONAL_EXPR_WARNING
+
+    if (std::numeric_limits<char>::is_signed)
     {
-        variant var = char(-60);
-        bool ok = false;
-        CHECK(var.to_uint32(&ok) == 0);
-        CHECK(ok == false);
-        CHECK(var.convert(type::get<uint32_t>()) == false);
+        SECTION("invalid conversion negative")
+        {
+            variant var = char(-60);
+            bool ok = false;
+            CHECK(var.to_uint32(&ok) == 0);
+            CHECK(ok == false);
+            CHECK(var.convert(type::get<uint32_t>()) == false);
+        }
     }
+
+RTTR_END_DISABLE_CONDITIONAL_EXPR_WARNING
+
 }
 
 /////////////////////////////////////////////////////////////////////////////////////////

diff --git a/src/unit_tests/variant/variant_conv_to_uint64.cpp b/src/unit_tests/variant/variant_conv_to_uint64.cpp
@@ -87,14 +87,22 @@ TEST_CASE("variant::to_uint64() - from char", "[variant]")
         CHECK(var.get_value<uint64_t>() == 65);
     }
 
-    SECTION("invalid conversion negative")
+RTTR_BEGIN_DISABLE_CONDITIONAL_EXPR_WARNING
+
+    if (std::numeric_limits<char>::is_signed)
     {
-        variant var = char(-60);
-        bool ok = false;
-        CHECK(var.to_uint64(&ok) == 0);
-        CHECK(ok == false);
-        CHECK(var.convert(type::get<uint64_t>()) == false);
+        SECTION("invalid conversion negative")
+        {
+            variant var = char(-60);
+            bool ok = false;
+            CHECK(var.to_uint64(&ok) == 0);
+            CHECK(ok == false);
+            CHECK(var.convert(type::get<uint64_t>()) == false);
+        }
     }
+
+RTTR_END_DISABLE_CONDITIONAL_EXPR_WARNING
+
 }
 
 /////////////////////////////////////////////////////////////////////////////////////////

diff --git a/src/unit_tests/variant/variant_conv_to_uint8.cpp b/src/unit_tests/variant/variant_conv_to_uint8.cpp
@@ -87,14 +87,22 @@ TEST_CASE("variant::to_uint8() - from char", "[variant]")
         CHECK(var.get_value<uint8_t>() == 65);
     }
 
-    SECTION("invalid conversion negative")
+RTTR_BEGIN_DISABLE_CONDITIONAL_EXPR_WARNING
+
+    if (std::numeric_limits<char>::is_signed)
     {
-        variant var = char(-60);
-        bool ok = false;
-        CHECK(var.to_uint8(&ok) == 0);
-        CHECK(ok == false);
-        CHECK(var.convert(type::get<uint8_t>()) == false);
+        SECTION("invalid conversion negative")
+        {
+            variant var = char(-60);
+            bool ok = false;
+            CHECK(var.to_uint8(&ok) == 0);
+            CHECK(ok == false);
+            CHECK(var.convert(type::get<uint8_t>()) == false);
+        }
     }
+
+RTTR_END_DISABLE_CONDITIONAL_EXPR_WARNING
+
 }
 
 /////////////////////////////////////////////////////////////////////////////////////////