Merge from core

be85bb32 · Jesse Beder · da118bbb · f6a6f46b · be85bb32 · be85bb32
Commit be85bb32 authored Mar 23, 2014 by Jesse Beder
Showing with 1009 additions and 1150 deletions

test/CMakeLists.txt test/CMakeLists.txt +1 -1

test/emittertests.cpp test/emittertests.cpp +1 -1149

test/integration/emitter_test.cpp test/integration/emitter_test.cpp +1007 -0

No files found.
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -2,7 +2,7 @@ add_subdirectory(gtest-1.7.0)
 include_directories(gtest-1.7.0/include)
 file(GLOB test_headers [a-z_]*.h)
-file(GLOB test_sources [a-z_]*.cpp node/[a-z_]*.cpp)
+file(GLOB test_sources [a-z_]*.cpp integration/[a-z_]*.cpp node/[a-z_]*.cpp)
 file(GLOB test_new_api_sources new-api/[a-z]*.cpp)
 list(APPEND test_sources ${test_new_api_sources})

--- a/test/emittertests.cpp
+++ b/test/emittertests.cpp
--- a/test/integration/emitter_test.cpp
+++ b/test/integration/emitter_test.cpp