From a735c60d6b01fecf14d7bfc0b3a79d724fd718ff Mon Sep 17 00:00:00 2001
From: =?utf8?q?Ale=C5=A1=20K=C5=99enek?= <ljocha@ics.muni.cz>
Date: Thu, 6 Sep 2007 21:53:53 +0000
Subject: [PATCH] remove unnecessary objs from test_query_events

---
 org.glite.lb.server/Makefile                   | 17 ++++++++++-------
 org.glite.lb.server/interface/lb_authz.h       |  8 ++++++++
 org.glite.lb.server/test/test_query_events.cpp | 20 +++++++++++++++++++-
 3 files changed, 37 insertions(+), 8 deletions(-)

diff --git a/org.glite.lb.server/Makefile b/org.glite.lb.server/Makefile
index 21969bd..dd200ee 100644
--- a/org.glite.lb.server/Makefile
+++ b/org.glite.lb.server/Makefile
@@ -99,7 +99,7 @@ ifdef LB_PROF
 	LDFLAGS:=${LDFLAGS} -pg
 else
 	SRVBONES_LIB:= -L${stagedir}/lib -lglite_lb_server_bones
-	LB_COMMON_LIB:=-lglite_lb_common_${nothrflavour}
+	LB_COMMON_LIB:=-L${stagedir}/lib -lglite_lb_common_${nothrflavour}
 endif
 
 ifdef LBS_DB_PROFILE
@@ -294,21 +294,24 @@ LB.xh: ws_typemap.dat ${stagedir}/interface/LB.wsdl
 	rm -f LBTypes.wsdl
 
 test.xml: test_xml
-#	./test_xml
+	./test_xml
 
 test_xml: test_xml.cpp
 	${CXX} -c ${CFLAGS} ${TEST_INC} $<
-	${LINKXX} -o $@ test_xml.o lb_xml_parse.o ${COMMON_LIBS} ${TEST_LIBS} ${EXT_LIBS}
+	${LINKXX} -o $@ test_xml.o lb_xml_parse.o ${LB_COMMON_LIB} ${TEST_LIBS}
 
 test.query: test_query_events
 	./test_query_events
 
 #query_events_objs:=`echo ${BKSERVER_BASE_OBJS} |sed 's/lbs_db\.o//;s/lbs_db_supp\.o//;s/bkserverd\.o//;s/db_store\.o//;s/stored_master\.o//;s/store\.o//;s/srv_purge\.o//;s/load\.o//;s/dump\.o//;s/lb_proto\.o//;s/lb_html\.o//;s/lb_http\.o//;'`
-query_events_objs:=`echo ${BKSERVER_BASE_OBJS} |sed 's/lbs_db\.o//;s/lbs_db_supp\.o//;s/bkserverd\.o//;'`
+#query_events_objs:=`echo ${BKSERVER_BASE_OBJS} |sed 's/lbs_db\.o//;s/lbs_db_supp\.o//;s/bkserverd\.o//;s/lb_authz\.o//'`
 
-test_query_events: test_query_events.o
-	${LINKXX} -o $@ test_query_events.o ${query_events_objs} \
-	${TEST_LIBS} ${COMMON_LIBS} ${EXT_LIBS}
+query_events_objs := test_query_events.o query.o get_events.o jobstat_supp.o index.o
+
+test_query_events: ${query_events_objs}
+	${LINKXX} -o $@ ${query_events_objs} \
+	${TEST_LIBS} ${LB_COMMON_LIB}
+#	${TEST_LIBS} ${COMMON_LIBS} ${EXT_LIBS}
 
 test.soapconv: test_soap_conv
 	./test_soap_conv
diff --git a/org.glite.lb.server/interface/lb_authz.h b/org.glite.lb.server/interface/lb_authz.h
index 137dd57..8e4b982 100644
--- a/org.glite.lb.server/interface/lb_authz.h
+++ b/org.glite.lb.server/interface/lb_authz.h
@@ -1,6 +1,10 @@
 #ifndef LB_AUTHZ_H
 #define LB_AUTHZ_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #ifndef NO_GACL
 #include <gridsite.h>
 #endif 
@@ -56,4 +60,8 @@ edg_wll_SetVomsGroups(edg_wll_Context, edg_wll_GssConnection *, char *, char *,
 extern void
 edg_wll_FreeVomsGroups(edg_wll_VomsGroups *);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
diff --git a/org.glite.lb.server/test/test_query_events.cpp b/org.glite.lb.server/test/test_query_events.cpp
index 1bc7c74..5bcea9a 100644
--- a/org.glite.lb.server/test/test_query_events.cpp
+++ b/org.glite.lb.server/test/test_query_events.cpp
@@ -8,7 +8,11 @@
 #include <glite/lb/consumer.h>
 #include <glite/lb/context-int.h>
 
+
 #include "lbs_db.h"
+
+#define NO_GACL
+#include "lb_authz.h"
 #include "get_events.h"
 
 using namespace std;
@@ -140,7 +144,21 @@ int edg_wll_Commit(edg_wll_Context ctx) { return 0; }
 int edg_wll_Rollback(edg_wll_Context ctx) { return 0; }
 
 edg_wll_ErrorCode edg_wll_bufferedInsert(edg_wll_bufInsert *bi, char *row)  { return (edg_wll_ErrorCode) 0; };
-	
+
+
+int edg_wll_JobStatus(
+	edg_wll_Context	ctx,
+	const edg_wlc_JobId		job,
+	int		flags,
+	edg_wll_JobStat	*stat)
+{
+	return 0;
+}
+
+int edg_wll_GetACL(edg_wll_Context ctx, edg_wlc_JobId jobid, edg_wll_Acl *acl) { return 0; }
+int edg_wll_CheckACL(edg_wll_Context ctx, edg_wll_Acl acl, int requested_perm) { return 0; }
+void edg_wll_FreeAcl(edg_wll_Acl acl) { return; }
+
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(QueryEventsTest);
-- 
1.8.2.3