From 50989850d21bece7e421dfbbc5ef165e0e66bb50 Mon Sep 17 00:00:00 2001
From: anonymous <local@localhost>
Date: Thu, 29 Jul 2010 01:00:54 +0700
Subject: Fixes in tests

---
 test/CMakeLists.txt      | 13 ++++++-------
 test/expected_output.log | 21 ---------------------
 2 files changed, 6 insertions(+), 28 deletions(-)
 delete mode 100644 test/expected_output.log

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 6e6ea58..99ad4d1 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -15,21 +15,20 @@ target_link_libraries(cxxrt-test-shared cxxrt-shared pthread dl)
 
 add_executable(system-test ${CXXTEST_SOURCES})
 
-file(READ "${CMAKE_CURRENT_SOURCE_DIR}/expected_output.log" expected_output)
+# Generating excpected output with system-test
+add_custom_target(test-expected-output ALL
+                  COMMAND system-test > ${CMAKE_CURRENT_BINARY_DIR}/expected_output.log 2>&1
+                  DEPENDS system-test)
 
-add_test(system-test-test
-         ${CMAKE_CURRENT_SOURCE_DIR}/run_test.sh
-         ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/system-test
-         ${CMAKE_CURRENT_SOURCE_DIR}/expected_output.log)
 
 add_test(cxxrt-test-static-test
          ${CMAKE_CURRENT_SOURCE_DIR}/run_test.sh
          ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/cxxrt-test-static
-         ${CMAKE_CURRENT_SOURCE_DIR}/expected_output.log)
+         ${CMAKE_CURRENT_BINARY_DIR}/expected_output.log)
 
 add_test(cxxrt-test-shared-test
          ${CMAKE_CURRENT_SOURCE_DIR}/run_test.sh
          ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/cxxrt-test-shared
-         ${CMAKE_CURRENT_SOURCE_DIR}/expected_output.log)
+         ${CMAKE_CURRENT_BINARY_DIR}/expected_output.log)
 
 
diff --git a/test/expected_output.log b/test/expected_output.log
deleted file mode 100644
index 6c95ecc..0000000
--- a/test/expected_output.log
+++ /dev/null
@@ -1,21 +0,0 @@
-Initialized static
-Initialized static
-Entering try
-Caught int 1!
-cl destroyed: 12
-Entering try
-Caught float 1.000000!
-cl destroyed: 12
-Entering try
-Caught struct {2}!
-cl destroyed: 12
-Entering try
-Caught struct {2}!
-cl destroyed: 12
-cl destroyed: 123
-Caught re-thrown float
-Entering try
-Caught int 0!
-cl destroyed: 12
-
-23 tests, 23 passed, 0 failed
-- 
cgit v1.2.3