mirror of
https://github.com/jbeder/yaml-cpp.git
synced 2025-09-09 12:41:17 +00:00
Began new-api branch, and removed all traces of the old api from this branch
This commit is contained in:
@@ -1,13 +1,8 @@
|
||||
file(GLOB test_headers [a-z]*.h)
|
||||
file(GLOB test_sources [a-z]*.cpp)
|
||||
file(GLOB test_old_api_sources old-api/[a-z]*.cpp)
|
||||
file(GLOB test_new_api_sources new-api/[a-z]*.cpp)
|
||||
|
||||
if(YAML_CPP_BUILD_OLD_API)
|
||||
list(APPEND test_sources ${test_old_api_sources})
|
||||
else()
|
||||
list(APPEND test_sources ${test_new_api_sources})
|
||||
endif()
|
||||
list(APPEND test_sources ${test_new_api_sources})
|
||||
|
||||
include_directories(${YAML_CPP_SOURCE_DIR}/test)
|
||||
|
||||
|
@@ -1008,15 +1008,7 @@ namespace Test
|
||||
|
||||
if(output == desiredOutput) {
|
||||
try {
|
||||
#ifdef YAML_CPP_OLD_API
|
||||
std::stringstream stream(output);
|
||||
YAML::Parser parser;
|
||||
YAML::Node node;
|
||||
parser.GetNextDocument(node);
|
||||
#else
|
||||
YAML::Node node = YAML::Load(output);
|
||||
#endif
|
||||
|
||||
passed++;
|
||||
} catch(const YAML::Exception& e) {
|
||||
std::cout << "Emitter test failed: " << name << "\n";
|
||||
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -23,11 +23,9 @@ namespace Test
|
||||
if(!RunSpecTests())
|
||||
passed = false;
|
||||
|
||||
#ifndef YAML_CPP_OLD_API
|
||||
if(!RunNodeTests())
|
||||
passed = false;
|
||||
#endif
|
||||
|
||||
|
||||
if(passed)
|
||||
std::cout << "All tests passed!\n";
|
||||
}
|
||||
|
Reference in New Issue
Block a user