From c8c3c302e40e59dc87c06076a3645ff26faef5f6 Mon Sep 17 00:00:00 2001
From: Dragos Carp <dragoscarp@gmail.com>
Date: Wed, 16 Oct 2013 17:31:54 +0200
Subject: [PATCH] Adapted tests

---
 tests/CMakeLists.txt     |  2 +-
 tests/run_tests_linux.sh | 15 +++++++--------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 8f8a97f..9621161 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 2.8.1)
 # We must explicitly indicate we're using the D language
 # in the project declaration.  Listing other languages
 # is fine.
-PROJECT (CMAKED2_TESTS C D )
+PROJECT (CMAKE-D_TESTS C D )
 SET( GLOBAL_DMD_DEFS "-w" )
 SET( GLOBAL_GCC_DEFS "-Wall -pedantic" )
 
diff --git a/tests/run_tests_linux.sh b/tests/run_tests_linux.sh
index 7380f97..2e25ae8 100755
--- a/tests/run_tests_linux.sh
+++ b/tests/run_tests_linux.sh
@@ -5,14 +5,15 @@
 # This script creates a build directory as a peer of cmaked2,
 # and builds the tests there.
 #
-cd ../..
-rm -rf cmake-d-test-build
-mkdir -p cmake-d-test-build
-cd cmake-d-test-build
+CMAKE_DIR=`pwd`/../cmake-d
+TEST_DIR=../../cmake-d-test-build
+rm -rf $TEST_DIR
+mkdir -p $TEST_DIR
+cd $TEST_DIR
 mkdir -p release
 cd release
 # Do a release build
-cmake ../../cmake-d/tests
+cmake -DCMAKE_MODULE_PATH:PATH=$CMAKE_DIR ../../cmake-d/tests
 make
 make test
 cd ..
@@ -20,8 +21,6 @@ cd ..
 # Do a debug build
 mkdir -p debug
 cd debug
-cmake -DCMAKE_VERBOSE_MAKEFILE=1 -DCMAKE_BUILD_TYPE=debug ../../cmake-d/tests
+cmake -DCMAKE_MODULE_PATH:PATH=$CMAKE_DIR -DCMAKE_VERBOSE_MAKEFILE=1 -DCMAKE_BUILD_TYPE=debug ../../cmake-d/tests
 make
 make test
-cd ../..
-