UPSTREAM MERGE BROKEN: Merge commit '3832c25f17' into merge_14225

This commit is contained in:
Gregory Sanders 2019-01-28 06:26:24 -05:00
commit c62fab2d69
340 changed files with 4968 additions and 4168 deletions

View file

@ -937,17 +937,19 @@ BOOST_AUTO_TEST_CASE(script_build)
}
}
#ifdef UPDATE_JSON_TESTS
std::string strGen;
#endif
for (TestBuilder& test : tests) {
test.Test();
std::string str = JSONPrettyPrint(test.GetJSON());
#ifndef UPDATE_JSON_TESTS
#ifdef UPDATE_JSON_TESTS
strGen += str + ",\n";
#else
if (tests_set.count(str) == 0) {
BOOST_CHECK_MESSAGE(false, "Missing auto script_valid test: " + test.GetComment());
}
#endif
strGen += str + ",\n";
}
#ifdef UPDATE_JSON_TESTS