From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <lvm2-cvs-return-2506-listarch-lvm2-cvs=sources.redhat.com@sourceware.org>
Received: (qmail 13283 invoked by alias); 30 Nov 2009 14:59:27 -0000
Received: (qmail 13269 invoked by uid 9699); 30 Nov 2009 14:59:26 -0000
Date: Mon, 30 Nov 2009 14:59:00 -0000
Message-ID: <20091130145926.13267.qmail@sourceware.org>
From: mornfall@sourceware.org
To: lvm-devel@redhat.com, lvm2-cvs@sourceware.org
Subject: LVM2/test Makefile.in
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: 2009-11/txt/msg00050.txt.bz2

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	mornfall@sourceware.org	2009-11-30 14:59:26

Modified files:
	test           : Makefile.in 

Log message:
	More fixes for the testsuite in the $(builddir) != $(srcdir) situation.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/test/Makefile.in.diff?cvsroot=lvm2&r1=1.21&r2=1.22

--- LVM2/test/Makefile.in	2009/11/19 12:01:39	1.21
+++ LVM2/test/Makefile.in	2009/11/30 14:59:26	1.22
@@ -25,6 +25,18 @@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 
+# Shell quote;
+SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH))
+
+T = $(wildcard $(srcdir)/t-*.sh)
+
+ifeq ("@APPLIB@", "yes")
+T += $(srcdir)/lvm2app.sh
+all: api/vgtest
+api/vgtest:
+	$(MAKE) -C api vgtest
+endif
+
 all: init.sh
 	./bin/harness t-*.sh
 
@@ -46,21 +58,9 @@
 	echo 'export PATH' >> $@-t
 	chmod a-w $@-t
 	mv $@-t $@
-	-cp $(srcdir)/test-utils.sh .
-	-cp $(srcdir)/test-lib.sh .
-	-cp $(T) .
-
-# Shell quote;
-SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH))
-
-T = $(wildcard $(srcdir)/t-*.sh)
-
-ifeq ("@APPLIB@", "yes")
-T += lvm2app.sh
-all: api/vgtest
-api/vgtest:
-	$(MAKE) -C api vgtest
-endif
+	test "$(srcdir)" != "." && cp $(srcdir)/test-utils.sh \
+	                              $(srcdir)/test-lib.sh \
+	                              $(T) .
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@