From 39339d769a2a7744f9960c26d7ca9f7a1e0573c6 Mon Sep 17 00:00:00 2001
From: Jason Turner <lefticus@gmail.com>
Date: Fri, 19 Mar 2010 00:50:36 +0000
Subject: [PATCH] Get the rest of the unit tests passing. Note: ChaiScript now
 requires CMake 2.8, which is almost a year old, so this is fair, but for the
 meantime we will have to either get it from backports in ubuntu or from
 cmake.org

---
 CMakeLists.txt        | 20 ++++++++++++++------
 run_unit_tests.sh     | 24 ------------------------
 run_unit_tests_win.sh | 27 ---------------------------
 unittests/use.chai    |  2 +-
 4 files changed, 15 insertions(+), 58 deletions(-)
 delete mode 100755 run_unit_tests.sh
 delete mode 100644 run_unit_tests_win.sh

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 69eab0ce..7b2a67d7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,9 @@
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 2.8)
 
 project(chaiscript)
 
+include(CTest)
+
 FIND_LIBRARY(READLINE_LIBRARY NAMES readline PATH /usr/lib /usr/local/lib /opt/local/lib)
 
 enable_testing()
@@ -46,13 +48,19 @@ target_link_libraries(stl_extra ${Boost_LIBRARIES})
 
 file(GLOB UNIT_TESTS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/unittests/ ${CMAKE_CURRENT_SOURCE_DIR}/unittests/*.chai)
 
+IF(BUILD_TESTING)
 
+  foreach(filename ${UNIT_TESTS})
+    message(STATUS "Adding test ${filename}")
+    add_test(${filename} chaiscript_eval ${CMAKE_CURRENT_SOURCE_DIR}/unittests/unit_test.inc ${CMAKE_CURRENT_SOURCE_DIR}/unittests/${filename})
+  endforeach(filename)
 
-foreach(filename ${UNIT_TESTS})
-  message(STATUS "Adding test ${filename}")
-  add_test(${filename} chaiscript_eval ${CMAKE_CURRENT_SOURCE_DIR}/unittests/unit_test.inc ${CMAKE_CURRENT_SOURCE_DIR}/unittests/${filename})
-endforeach(filename)
-
+  SET_PROPERTY(TEST ${UNIT_TESTS}
+   PROPERTY ENVIRONMENT
+    "CHAI_USE_PATH=${CMAKE_CURRENT_SOURCE_DIR}/unittests/"
+    "CHAI_MODULE_PATH=${CMAKE_CURRENT_BINARY_DIR}/"
+  )
+ENDIF(BUILD_TESTING)
 
 install(TARGETS chaiscript_eval DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/bin)
         
diff --git a/run_unit_tests.sh b/run_unit_tests.sh
deleted file mode 100755
index 31918801..00000000
--- a/run_unit_tests.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/bash
-
-
-successes=0
-failures=0
-
-echo -n "Running unit tests"
-for file in unittests/*.chai
-do
-  tstname=${file%.*}
-	OUTPUT=`LD_LIBRARY_PATH=. ./chaiscript_eval unittests/unit_test.inc $file`
-	if [ "$?" -eq "0" ]
-	then
-		echo -n "."
-		successes=$((successes+1))
-	else
-		echo "[from failed test $file] $OUTPUT"
-		failures=$((failures+1))
-	fi
-done
-echo ""
-
-total=$((successes+failures))
-echo "$successes out of $total succeeded"
diff --git a/run_unit_tests_win.sh b/run_unit_tests_win.sh
deleted file mode 100644
index 82378822..00000000
--- a/run_unit_tests_win.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/bash
-
-successes=0
-failures=0
-
-echo -n "Running unit tests"
-for file in unittests/*.chai
-do
-  tstname=${file%.*}
-	tst="$tstname.txt"
-	./chaiscript_eval $file > /tmp/tstout.txt
-        cat $tst > /tmp/tstmaster.txt
-        awk 'sub("$", "\r")' $tst > /tmp/tstmaster.txt
-	diff /tmp/tstmaster.txt /tmp/tstout.txt
-	if [ "$?" -eq "0" ]
-	then
-		echo -n "."
-		successes=$((successes+1))
-	else
-		echo "[from failed test $file]"
-		failures=$((failures+1))
-	fi
-done
-echo ""
-
-total=$((successes+failures))
-echo "$successes out of $total succeeded"
diff --git a/unittests/use.chai b/unittests/use.chai
index 1d31935d..67dd9339 100644
--- a/unittests/use.chai
+++ b/unittests/use.chai
@@ -1,4 +1,4 @@
-use("unittests/use.inc")
+use("use.inc")
 
 assert_equal("hello", greet())