From 4921d9a89ec5aa909e90460daca78e17acb4ca3b Mon Sep 17 00:00:00 2001
From: Jonathan Turner <probata@hotmail.com>
Date: Fri, 29 May 2009 02:24:55 +0000
Subject: [PATCH] Enabling testing from the root

---
 CMakeLists.txt             | 2 ++
 boxedcpp/CMakeLists.txt    | 2 --
 langkit/CMakeLists.txt     | 3 +--
 langkit/langkit_parser.cpp | 1 +
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a17d5d9..2b0773c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,7 @@
 cmake_minimum_required(VERSION 2.6)
 
+enable_testing()
+
 project(jaytea)
 
 SET (CMAKE_BUILD_TYPE gdb)
diff --git a/boxedcpp/CMakeLists.txt b/boxedcpp/CMakeLists.txt
index 39d5e17..b6b2c76 100644
--- a/boxedcpp/CMakeLists.txt
+++ b/boxedcpp/CMakeLists.txt
@@ -1,8 +1,6 @@
 cmake_minimum_required(VERSION 2.6)
 enable_testing()
 
-
-
 project(boxedcpp)
 
 SET (CMAKE_BUILD_TYPE gdb)
diff --git a/langkit/CMakeLists.txt b/langkit/CMakeLists.txt
index f95ee99..551d2b7 100644
--- a/langkit/CMakeLists.txt
+++ b/langkit/CMakeLists.txt
@@ -1,7 +1,6 @@
 cmake_minimum_required(VERSION 2.6)
 enable_testing()
 
-
 project(langkit)
 
 SET (CMAKE_BUILD_TYPE gdb)
@@ -20,4 +19,4 @@ if(Boost_FOUND)
    target_link_libraries(langkit_unittest ${Boost_LIBRARIES})
 endif()
 
-add_test(langkit_unittest langkit_unittest)
+add_test(langkit_unittest ${EXECUTABLE_OUTPUT_PATH}/langkit_unittest)
diff --git a/langkit/langkit_parser.cpp b/langkit/langkit_parser.cpp
index b246b1d..a96dc5b 100644
--- a/langkit/langkit_parser.cpp
+++ b/langkit/langkit_parser.cpp
@@ -229,6 +229,7 @@ std::pair<Token_Iterator, bool> Optional_Rule
 Rule Str(const std::string &text, bool keep) {
     return Rule(boost::bind(String_Rule, _1, _2, _3, _4, _5, text), keep);
 }
+
 Rule Id(int id, bool keep) {
     return Rule(boost::bind(Type_Rule, _1, _2, _3, _4, _5, id), keep);
 }