Renamed yaml-reader test

2009-10-27 14:38:53 +00:00 · 2009-10-27 14:38:53 +00:00 · 7d5988401e
commit 7d5988401e
parent 47628bf25e
13 changed files with 11 additions and 15 deletions
--- 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)
--- a/test/CMakeLists.txt
+++ 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)
--- a/yaml-reader/emittertests.cpp
+++ b/yaml-reader/emittertests.cpp
--- a/yaml-reader/emittertests.h
+++ b/yaml-reader/emittertests.h
--- a/yaml-reader/main.cpp
+++ b/yaml-reader/main.cpp
--- a/yaml-reader/parsertests.cpp
+++ b/yaml-reader/parsertests.cpp
--- a/yaml-reader/parsertests.h
+++ b/yaml-reader/parsertests.h
--- a/yaml-reader/spectests.cpp
+++ b/yaml-reader/spectests.cpp
--- a/yaml-reader/spectests.h
+++ b/yaml-reader/spectests.h
--- a/yaml-reader/tests.cpp
+++ b/yaml-reader/tests.cpp
--- a/yaml-reader/tests.h
+++ b/yaml-reader/tests.h
--- a/yaml-reader/CMakeLists.txt
+++ b/yaml-reader/CMakeLists.txt
@ -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)
--- a/yaml-reader/tests/aliased.yaml
+++ b/yaml-reader/tests/aliased.yaml
@ -1,4 +0,0 @@
--- &list
- This document contains a recursive list.
- *list
-...