From a0bf12e7a18d3e8aa75fe444ea4ff360bc4e1928 Mon Sep 17 00:00:00 2001 From: Jesse Beder Date: Tue, 27 Oct 2009 14:38:53 +0000 Subject: [PATCH] Renamed yaml-reader test --- CMakeLists.txt | 2 +- test/CMakeLists.txt | 10 ++++++++++ {yaml-reader => test}/emittertests.cpp | 0 {yaml-reader => test}/emittertests.h | 0 {yaml-reader => test}/main.cpp | 0 {yaml-reader => test}/parsertests.cpp | 0 {yaml-reader => test}/parsertests.h | 0 {yaml-reader => test}/spectests.cpp | 0 {yaml-reader => test}/spectests.h | 0 {yaml-reader => test}/tests.cpp | 0 {yaml-reader => test}/tests.h | 0 yaml-reader/CMakeLists.txt | 10 ---------- yaml-reader/tests/aliased.yaml | 4 ---- 13 files changed, 11 insertions(+), 15 deletions(-) create mode 100644 test/CMakeLists.txt rename {yaml-reader => test}/emittertests.cpp (100%) rename {yaml-reader => test}/emittertests.h (100%) rename {yaml-reader => test}/main.cpp (100%) rename {yaml-reader => test}/parsertests.cpp (100%) rename {yaml-reader => test}/parsertests.h (100%) rename {yaml-reader => test}/spectests.cpp (100%) rename {yaml-reader => test}/spectests.h (100%) rename {yaml-reader => test}/tests.cpp (100%) rename {yaml-reader => test}/tests.h (100%) delete mode 100644 yaml-reader/CMakeLists.txt delete mode 100644 yaml-reader/tests/aliased.yaml diff --git a/CMakeLists.txt b/CMakeLists.txt index 9e061e0..8c42e23 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -67,6 +67,6 @@ if(UNIX) endif(UNIX) if(YAML_CPP_BUILD_TOOLS) - add_subdirectory (yaml-reader) + add_subdirectory (test) add_subdirectory (util) endif(YAML_CPP_BUILD_TOOLS) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt new file mode 100644 index 0000000..9e318f1 --- /dev/null +++ b/test/CMakeLists.txt @@ -0,0 +1,10 @@ +file(GLOB test_headers [a-z]*.h) +file(GLOB test_sources [a-z]*.cpp) + +add_executable(run-tests + ${test_sources} + ${test_headers} +) +target_link_libraries(run-tests yaml-cpp) + +add_test(yaml-reader-test run-tests) diff --git a/yaml-reader/emittertests.cpp b/test/emittertests.cpp similarity index 100% rename from yaml-reader/emittertests.cpp rename to test/emittertests.cpp diff --git a/yaml-reader/emittertests.h b/test/emittertests.h similarity index 100% rename from yaml-reader/emittertests.h rename to test/emittertests.h diff --git a/yaml-reader/main.cpp b/test/main.cpp similarity index 100% rename from yaml-reader/main.cpp rename to test/main.cpp diff --git a/yaml-reader/parsertests.cpp b/test/parsertests.cpp similarity index 100% rename from yaml-reader/parsertests.cpp rename to test/parsertests.cpp diff --git a/yaml-reader/parsertests.h b/test/parsertests.h similarity index 100% rename from yaml-reader/parsertests.h rename to test/parsertests.h diff --git a/yaml-reader/spectests.cpp b/test/spectests.cpp similarity index 100% rename from yaml-reader/spectests.cpp rename to test/spectests.cpp diff --git a/yaml-reader/spectests.h b/test/spectests.h similarity index 100% rename from yaml-reader/spectests.h rename to test/spectests.h diff --git a/yaml-reader/tests.cpp b/test/tests.cpp similarity index 100% rename from yaml-reader/tests.cpp rename to test/tests.cpp diff --git a/yaml-reader/tests.h b/test/tests.h similarity index 100% rename from yaml-reader/tests.h rename to test/tests.h diff --git a/yaml-reader/CMakeLists.txt b/yaml-reader/CMakeLists.txt deleted file mode 100644 index 2b58180..0000000 --- a/yaml-reader/CMakeLists.txt +++ /dev/null @@ -1,10 +0,0 @@ -file(GLOB yaml-reader_headers [a-z]*.h) -file(GLOB yaml-reader_sources [a-z]*.cpp) - -add_executable(yaml-reader - ${yaml-reader_sources} - ${yaml-reader_headers} -) -target_link_libraries(yaml-reader yaml-cpp) - -add_test(yaml-reader-test yaml-reader) diff --git a/yaml-reader/tests/aliased.yaml b/yaml-reader/tests/aliased.yaml deleted file mode 100644 index ca79a64..0000000 --- a/yaml-reader/tests/aliased.yaml +++ /dev/null @@ -1,4 +0,0 @@ ---- &list -- This document contains a recursive list. -- *list -...