Work around the need for symlinks {glite,lb} -> . (make check before staging)

diff --git a/org.glite.lb.common/test/il_int_test.cpp b/org.glite.lb.common/test/il_int_test.cpp
index 9da319c..f547019 100644 (file)
--- a/org.glite.lb.common/test/il_int_test.cpp
+++ b/org.glite.lb.common/test/il_int_test.cpp
@@ -2,7 +2,11 @@
 
 
 extern "C" {
+#ifdef BUILDING_LB_COMMON
+#include "il_string.h"
+#else
 #include "glite/lb/il_string.h"
+#endif
 }
 
 class IlIntTest: public CppUnit::TestFixture

diff --git a/org.glite.lb.common/test/il_msg_test.cpp b/org.glite.lb.common/test/il_msg_test.cpp
index 6ae5cb0..da81962 100644 (file)
--- a/org.glite.lb.common/test/il_msg_test.cpp
+++ b/org.glite.lb.common/test/il_msg_test.cpp
@@ -3,8 +3,13 @@
 
 extern "C" {
 #include <string.h>
+#ifdef BUILDING_LB_COMMON
+#include "il_string.h"
+#include "il_msg.h"
+#else
 #include "glite/lb/il_string.h"
 #include "glite/lb/il_msg.h"
+#endif
 }
 
 class IlMsgTest : public CppUnit::TestFixture 

diff --git a/org.glite.lb.common/test/il_string_test.cpp b/org.glite.lb.common/test/il_string_test.cpp
index e1217f5..8a11841 100644 (file)
--- a/org.glite.lb.common/test/il_string_test.cpp
+++ b/org.glite.lb.common/test/il_string_test.cpp
@@ -2,7 +2,11 @@
 
 extern "C" {
 #include <string.h>
+#ifdef BUILDING_LB_COMMON
+#include "il_string.h"
+#else
 #include "glite/lb/il_string.h"
+#endif
 }
 
 class IlStringTest : public CppUnit::TestFixture 

diff --git a/org.glite.lb.common/test/parse.cpp.T b/org.glite.lb.common/test/parse.cpp.T
index 3a9620c..e5cd14a 100644 (file)
--- a/org.glite.lb.common/test/parse.cpp.T
+++ b/org.glite.lb.common/test/parse.cpp.T
@@ -3,8 +3,11 @@
 #include <cppunit/extensions/HelperMacros.h>
 #include <cppunit/TestFixture.h>
 
-
+#ifdef BUILDING_LB_COMMON
+#include "events_parse.h"
+#else
 #include "glite/lb/events_parse.h"
+#endif
 
 class EventParseTest: public  CppUnit::TestFixture
 {