From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <lvm2-cvs-return-4207-listarch-lvm2-cvs=sources.redhat.com@sourceware.org>
Received: (qmail 18852 invoked by alias); 27 Jun 2011 13:44:35 -0000
Received: (qmail 18828 invoked by uid 9699); 27 Jun 2011 13:44:35 -0000
Date: Mon, 27 Jun 2011 13:44:00 -0000
Message-ID: <20110627134435.18826.qmail@sourceware.org>
From: mornfall@sourceware.org
To: lvm-devel@redhat.com, lvm2-cvs@sourceware.org
Subject: LVM2/daemons/lvmetad Makefile test.sh
Mailing-List: contact lvm2-cvs-help@sourceware.org; run by ezmlm
Precedence: bulk
List-Id: <lvm2-cvs.sourceware.org>
List-Subscribe: <mailto:lvm2-cvs-subscribe@sourceware.org>
List-Post: <mailto:lvm2-cvs@sourceware.org>
List-Help: <mailto:lvm2-cvs-help@sourceware.org>, <http://sourceware.org/lists.html#faqs>
Sender: lvm2-cvs-owner@sourceware.org
X-SW-Source: 2011-06/txt/msg00054.txt.bz2

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	mornfall@sourceware.org	2011-06-27 13:44:34

Modified files:
	daemons/lvmetad: Makefile 
Added files:
	daemons/lvmetad: test.sh 

Log message:
	LVMetaD build hack: link to lvm-internal &c. and add a simple test script.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/daemons/lvmetad/test.sh.diff?cvsroot=lvm2&r1=NONE&r2=1.1
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/daemons/lvmetad/Makefile.diff?cvsroot=lvm2&r1=1.1&r2=1.2

/cvs/lvm2/LVM2/daemons/lvmetad/test.sh,v  -->  standard output
revision 1.1
--- LVM2/daemons/lvmetad/test.sh
+++ -	2011-06-27 13:44:34.722209000 +0000
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+export LD_LIBRARY_PATH="$1"
+
+test -n "$2" && {
+    ./lvmetad -f &
+    PID=$!
+    sleep .1
+    ./testclient
+    kill $PID
+    exit 0
+}
+
+sudo ./test.sh "$1" .
--- LVM2/daemons/lvmetad/Makefile	2011/06/14 02:36:38	1.1
+++ LVM2/daemons/lvmetad/Makefile	2011/06/27 13:44:33	1.2
@@ -13,9 +13,10 @@
 CLIENT_H = ../common/daemon-client.h $(SHARED_H)
 SERVER_H = ../common/daemon-server.h $(SHARED_H)
 
-LIBS = -ldevmapper -lpthread
+LIBS = -ldevmapper -lpthread -ldevmapper-event -llvm-internal -ldl
 IPATH = -I../common -I/srv/build/lvm2/cvs-lvmetad/default/include
-LPATH = -L/srv/build/lvm2/cvs-lvmetad/default/libdm
+BUILDDIR = /srv/build/lvm2/cvs-lvmetad/default
+LPATH = -L$(BUILDDIR)/libdm -L$(BUILDDIR)/lib -L$(BUILDDIR)/daemons/dmeventd
 
 all: testclient lvmetad
 
@@ -24,3 +25,6 @@
 
 lvmetad: lvmetad-core.c ../common/daemon-server.c ../common/daemon-server.h ../common/daemon-shared.h ../common/daemon-shared.c
 	gcc -g lvmetad-core.c $(SERVER) $(IPATH) $(LPATH) $(LIBS) -o lvmetad
+
+check: testclient lvmetad
+	./test.sh "$(BUILDDIR)/libdm:$(BUILDDIR)/daemons/dmeventd"