From a02864b7264a03c553d65bb89e2e0390026f2d22 Mon Sep 17 00:00:00 2001
From: rfm <rfm@72102866-910b-0410-8b05-ffd578937521>
Date: Sun, 13 Mar 2011 12:14:40 +0000
Subject: [PATCH] improve testing

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@32544 72102866-910b-0410-8b05-ffd578937521
---
 ChangeLog             |  5 +++++
 Source/CXXException.m |  2 +-
 Tests/GNUmakefile     | 12 +++++++++++-
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index cbf950b0a..b43721a33 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-03-13  Richard Frith-Macdonald <rfm@gnu.org>
+
+	* Source/CXXException.m: fix error in include
+	* Tests/GNUmakefile: add info for testing local copy of library
+
 2011-03-13  Richard Frith-Macdonald <rfm@gnu.org>
 
 	* configure.ac:
diff --git a/Source/CXXException.m b/Source/CXXException.m
index f1239b284..fd09a1bb6 100644
--- a/Source/CXXException.m
+++ b/Source/CXXException.m
@@ -1,7 +1,7 @@
 #if defined(__has_include)
 #if __has_include(<objc/hooks.h>)
 #import "Foundation/NSObject.h"
-#import "Additions/GNUstepBase/CXXException.h"
+#import "GNUstepBase/CXXException.h"
 #include <objc/runtime.h>
 #include <objc/hooks.h>
 
diff --git a/Tests/GNUmakefile b/Tests/GNUmakefile
index e5c4000b9..6d8685925 100644
--- a/Tests/GNUmakefile
+++ b/Tests/GNUmakefile
@@ -42,13 +42,23 @@ endif
 
 include $(GNUSTEP_MAKEFILES)/common.make
 
+TOP_DIR=$(shell dirname $(CURDIR))
+
 TEST_TOOL_NAMES=
 
 all::
 	@(echo If you want to run the gnustep-base testsuite, please type \'make check\')
 
 check::
-	gnustep-tests base
+	(\
+	ADDITIONAL_INCLUDE_DIRS="-I$(TOP_DIR)/Headers -I$(TOP_DIR)/Headers/Additions -I$(TOP_DIR)/Source";\
+	ADDITIONAL_LIB_DIRS="-L$(TOP_DIR)/Source/$(GNUSTEP_OBJ_DIR)";\
+	LD_LIBRARY_PATH="$(TOP_DIR)/Source/$(GNUSTEP_OBJ_DIR):${LD_LIBRARY_PATH}";\
+	export ADDITIONAL_INCLUDE_DIRS;\
+	export ADDITIONAL_LIB_DIRS;\
+	export LD_LIBRARY_PATH;\
+	gnustep-tests base;\
+	)
 
 clean::
 	gnustep-tests --clean