mirror of
https://github.com/nlohmann/json.git
synced 2026-09-01 05:57:14 +00:00
Re-enable the array and binary container tests
AppVeyor passed with all three new translation units disabled, so the library changes, the reduced alt_string, and the unflatten() tests are fine on MSVC 2015 and 2017; the cause is one of the six basic_json instantiations the new tests add. Bring back two of the three. If AppVeyor passes again, the cause is in unit-custom-object-type.cpp, which is the one still disabled; if it fails, it is in one of these two and needs one more split. Still temporary. Signed-off-by: Niels Lohmann <mail@nlohmann.me>
This commit is contained in:
@@ -17,12 +17,6 @@
|
|||||||
#include <type_traits>
|
#include <type_traits>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
// TEMPORARY: this translation unit is disabled to narrow down an AppVeyor
|
|
||||||
// failure on MSVC 2015/2017 whose build log this environment cannot reach.
|
|
||||||
// The macro is deliberately never defined; the guard is removed again as soon
|
|
||||||
// as the cause is known.
|
|
||||||
#ifdef JSON_BISECT_CUSTOM_CONTAINER_TESTS
|
|
||||||
|
|
||||||
namespace
|
namespace
|
||||||
{
|
{
|
||||||
|
|
||||||
@@ -154,5 +148,3 @@ TEST_CASE("array type without at()")
|
|||||||
CHECK(j.at(no_at_json::json_pointer("/1")) == 2);
|
CHECK(j.at(no_at_json::json_pointer("/1")) == 2);
|
||||||
CHECK_THROWS_AS(j.at(no_at_json::json_pointer("/3")), no_at_json::out_of_range);
|
CHECK_THROWS_AS(j.at(no_at_json::json_pointer("/3")), no_at_json::out_of_range);
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|||||||
@@ -21,12 +21,6 @@
|
|||||||
#include <cstddef>
|
#include <cstddef>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// TEMPORARY: this translation unit is disabled to narrow down an AppVeyor
|
|
||||||
// failure on MSVC 2015/2017 whose build log this environment cannot reach.
|
|
||||||
// The macro is deliberately never defined; the guard is removed again as soon
|
|
||||||
// as the cause is known.
|
|
||||||
#ifdef JSON_BISECT_CUSTOM_CONTAINER_TESTS
|
|
||||||
|
|
||||||
namespace
|
namespace
|
||||||
{
|
{
|
||||||
|
|
||||||
@@ -83,5 +77,3 @@ TEST_CASE("binary type whose value type is not std::uint8_t")
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|||||||
Reference in New Issue
Block a user