public inbox for lvm2-cvs@sourceware.org
help / color / mirror / Atom feed
* LVM2/test Makefile.in
@ 2009-11-30 14:59 mornfall
0 siblings, 0 replies; 33+ messages in thread
From: mornfall @ 2009-11-30 14:59 UTC (permalink / raw)
To: lvm-devel, lvm2-cvs
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)/$@
^ permalink raw reply [flat|nested] 33+ messages in thread* LVM2/test Makefile.in
@ 2012-03-14 17:14 zkabelac
0 siblings, 0 replies; 33+ messages in thread
From: zkabelac @ 2012-03-14 17:14 UTC (permalink / raw)
To: lvm-devel, lvm2-cvs
CVSROOT: /cvs/lvm2
Module name: LVM2
Changes by: zkabelac@sourceware.org 2012-03-14 17:14:34
Modified files:
test : Makefile.in
Log message:
Use proper "" for absolute paths
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/test/Makefile.in.diff?cvsroot=lvm2&r1=1.67&r2=1.68
--- LVM2/test/Makefile.in 2012/02/15 14:24:31 1.67
+++ LVM2/test/Makefile.in 2012/03/14 17:14:33 1.68
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2011 Red Hat, Inc. All rights reserved.
+# Copyright (C) 2007-2012 Red Hat, Inc. All rights reserved.
#
# This file is part of LVM2.
#
@@ -19,10 +19,10 @@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
top_builddir = @top_builddir@
-abs_srcdir = @abs_srcdir@
-abs_builddir = @abs_builddir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
+abs_srcdir = "@abs_srcdir@"
+abs_builddir = "@abs_builddir@"
+abs_top_builddir = "@abs_top_builddir@"
+abs_top_srcdir = "@abs_top_srcdir@"
SUBDIRS = api unit
SOURCES = lib/not.c lib/harness.c
@@ -98,12 +98,12 @@
.lib-dir-stamp:
$(MKDIR_P) lib
for i in $(CMDS); do ln -fs lvm-wrapper lib/$$i; done
- ln -fs "$(abs_top_builddir)/tools/dmsetup" lib/dmsetup
- ln -fs "$(abs_top_builddir)/daemons/clvmd/clvmd" lib/clvmd
- ln -fs "$(abs_top_builddir)/daemons/dmeventd/dmeventd" lib/dmeventd
- ln -fs "$(abs_top_builddir)/daemons/lvmetad/lvmetad" lib/lvmetad
- ln -fs "$(abs_top_srcdir)/scripts/vgimportclone.sh" lib/vgimportclone
- ln -fs "$(abs_top_srcdir)/scripts/fsadm.sh" lib/fsadm
+ ln -fs $(abs_top_builddir)/tools/dmsetup lib/dmsetup
+ ln -fs $(abs_top_builddir)/daemons/clvmd/clvmd lib/clvmd
+ ln -fs $(abs_top_builddir)/daemons/dmeventd/dmeventd lib/dmeventd
+ ln -fs $(abs_top_builddir)/daemons/lvmetad/lvmetad lib/lvmetad
+ ln -fs $(abs_top_srcdir)/scripts/vgimportclone.sh lib/vgimportclone
+ ln -fs $(abs_top_srcdir)/scripts/fsadm.sh lib/fsadm
touch $@
clean:
^ permalink raw reply [flat|nested] 33+ messages in thread
* LVM2/test Makefile.in
@ 2011-11-23 13:03 zkabelac
0 siblings, 0 replies; 33+ messages in thread
From: zkabelac @ 2011-11-23 13:03 UTC (permalink / raw)
To: lvm-devel, lvm2-cvs
CVSROOT: /cvs/lvm2
Module name: LVM2
Changes by: zkabelac@sourceware.org 2011-11-23 13:03:57
Modified files:
test : Makefile.in
Log message:
Swap condition order
Swap condtion so the make line does not return 'false'.
Remove cleanup of lvm2api.sh since it is not created anymore.
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/test/Makefile.in.diff?cvsroot=lvm2&r1=1.64&r2=1.65
--- LVM2/test/Makefile.in 2011/11/23 12:21:41 1.64
+++ LVM2/test/Makefile.in 2011/11/23 13:03:57 1.65
@@ -106,7 +106,7 @@
touch $@
clean:
- test "$(srcdir)" != . && $(RM) $(RUN_BASE) lvm2app.sh
+ test "$(srcdir)" = . || $(RM) $(RUN_BASE)
CLEAN_TARGETS += .lib-dir-stamp .tests-stamp $(LIB) $(addprefix lib/,$(CMDS)) \
lib/clvmd lib/dmeventd lib/dmsetup lib/lvmetad lib/fsadm lib/vgimportclone
^ permalink raw reply [flat|nested] 33+ messages in thread
* LVM2/test Makefile.in
@ 2011-11-20 21:55 mornfall
0 siblings, 0 replies; 33+ messages in thread
From: mornfall @ 2011-11-20 21:55 UTC (permalink / raw)
To: lvm-devel, lvm2-cvs
CVSROOT: /cvs/lvm2
Module name: LVM2
Changes by: mornfall@sourceware.org 2011-11-20 21:55:25
Modified files:
test : Makefile.in
Log message:
Fix a syntax error.
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/test/Makefile.in.diff?cvsroot=lvm2&r1=1.61&r2=1.62
--- LVM2/test/Makefile.in 2011/11/20 21:43:20 1.61
+++ LVM2/test/Makefile.in 2011/11/20 21:55:24 1.62
@@ -43,7 +43,7 @@
all: check
check: .tests-stamp
- @echo Running API (liblvm2app) tests
+ @echo "Running API (liblvm2app) tests"
make -C api tests
ifeq ("$(TESTING)", "yes")
@echo Running unit tests
^ permalink raw reply [flat|nested] 33+ messages in thread* LVM2/test Makefile.in
@ 2011-09-19 15:54 zkabelac
0 siblings, 0 replies; 33+ messages in thread
From: zkabelac @ 2011-09-19 15:54 UTC (permalink / raw)
To: lvm-devel, lvm2-cvs
CVSROOT: /cvs/lvm2
Module name: LVM2
Changes by: zkabelac@sourceware.org 2011-09-19 15:54:15
Modified files:
test : Makefile.in
Log message:
Ensure fsadm.sh is executable
When the srcdir == builddir we get the link on non-exectable file.
So make always sure fsadm.sh is executable script file.
Add cleanup target for lib/fsadm.
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/test/Makefile.in.diff?cvsroot=lvm2&r1=1.58&r2=1.59
--- LVM2/test/Makefile.in 2011/09/19 12:50:17 1.58
+++ LVM2/test/Makefile.in 2011/09/19 15:54:15 1.59
@@ -101,6 +101,7 @@
ln -fs "$(abs_top_builddir)/daemons/dmeventd/dmeventd" lib/dmeventd
ln -fs "$(abs_top_builddir)/daemons/lvmetad/lvmetad" lib/lvmetad
ln -fs "$(abs_top_builddir)/scripts/vgimportclone.sh" lib/vgimportclone
+ chmod +x "$(abs_top_builddir)/scripts/fsadm.sh"
ln -fs "$(abs_top_builddir)/scripts/fsadm.sh" lib/fsadm
touch $@
@@ -109,6 +110,6 @@
if test "$(srcdir)" != . ; then rm -f $(subst $(srcdir)/, ,$(RUN)) lvm2app.sh ; fi
CLEAN_TARGETS += .lib-dir-stamp .test-stamp $(LIB) \
- lib/dmsetup lib/clvmd lib/dmeventd lib/vgimportclone
+ lib/dmsetup lib/clvmd lib/dmeventd lib/vgimportclone lib/fsadm
.NOTPARALLEL:
^ permalink raw reply [flat|nested] 33+ messages in thread
* LVM2/test Makefile.in
@ 2011-09-19 12:50 zkabelac
0 siblings, 0 replies; 33+ messages in thread
From: zkabelac @ 2011-09-19 12:50 UTC (permalink / raw)
To: lvm-devel, lvm2-cvs
CVSROOT: /cvs/lvm2
Module name: LVM2
Changes by: zkabelac@sourceware.org 2011-09-19 12:50:17
Modified files:
test : Makefile.in
Log message:
Add link for fsadm script
Prepare to enabling t-fsadm.sh test
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/test/Makefile.in.diff?cvsroot=lvm2&r1=1.57&r2=1.58
--- LVM2/test/Makefile.in 2011/08/31 11:31:58 1.57
+++ LVM2/test/Makefile.in 2011/09/19 12:50:17 1.58
@@ -101,6 +101,7 @@
ln -fs "$(abs_top_builddir)/daemons/dmeventd/dmeventd" lib/dmeventd
ln -fs "$(abs_top_builddir)/daemons/lvmetad/lvmetad" lib/lvmetad
ln -fs "$(abs_top_builddir)/scripts/vgimportclone.sh" lib/vgimportclone
+ ln -fs "$(abs_top_builddir)/scripts/fsadm.sh" lib/fsadm
touch $@
clean:
^ permalink raw reply [flat|nested] 33+ messages in thread
* LVM2/test Makefile.in
@ 2011-04-28 22:17 zkabelac
0 siblings, 0 replies; 33+ messages in thread
From: zkabelac @ 2011-04-28 22:17 UTC (permalink / raw)
To: lvm-devel, lvm2-cvs
CVSROOT: /cvs/lvm2
Module name: LVM2
Changes by: zkabelac@sourceware.org 2011-04-28 22:17:06
Modified files:
test : Makefile.in
Log message:
Add missing cleanup for vgimportclone script
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/test/Makefile.in.diff?cvsroot=lvm2&r1=1.55&r2=1.56
--- LVM2/test/Makefile.in 2011/04/21 17:42:58 1.55
+++ LVM2/test/Makefile.in 2011/04/28 22:17:06 1.56
@@ -106,6 +106,7 @@
for i in lvm $$(cat ../tools/.commands); do rm -f lib/$$i; done
if test "$(srcdir)" != . ; then rm -f $(subst $(srcdir)/, ,$(RUN)) lvm2app.sh ; fi
-CLEAN_TARGETS += .lib-dir-stamp .test-stamp $(LIB) lib/dmsetup lib/clvmd lib/dmeventd
+CLEAN_TARGETS += .lib-dir-stamp .test-stamp $(LIB) \
+ lib/dmsetup lib/clvmd lib/dmeventd lib/vgimportclone
.NOTPARALLEL:
^ permalink raw reply [flat|nested] 33+ messages in thread
* LVM2/test Makefile.in
@ 2011-04-21 17:42 wysochanski
0 siblings, 0 replies; 33+ messages in thread
From: wysochanski @ 2011-04-21 17:42 UTC (permalink / raw)
To: lvm-devel, lvm2-cvs
CVSROOT: /cvs/lvm2
Module name: LVM2
Changes by: wysochanski@sourceware.org 2011-04-21 17:42:58
Modified files:
test : Makefile.in
Log message:
Add vgimportclone symlink for nightly test.
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/test/Makefile.in.diff?cvsroot=lvm2&r1=1.54&r2=1.55
--- LVM2/test/Makefile.in 2011/04/19 15:28:17 1.54
+++ LVM2/test/Makefile.in 2011/04/21 17:42:58 1.55
@@ -99,6 +99,7 @@
ln -s "$(abs_top_builddir)/tools/dmsetup" lib/dmsetup
ln -s "$(abs_top_builddir)/daemons/clvmd/clvmd" lib/clvmd
ln -s "$(abs_top_builddir)/daemons/dmeventd/dmeventd" lib/dmeventd
+ ln -s "$(abs_top_builddir)/scripts/vgimportclone.sh" lib/vgimportclone
touch $@
clean:
^ permalink raw reply [flat|nested] 33+ messages in thread
* LVM2/test Makefile.in
@ 2011-04-19 15:28 mornfall
0 siblings, 0 replies; 33+ messages in thread
From: mornfall @ 2011-04-19 15:28 UTC (permalink / raw)
To: lvm-devel, lvm2-cvs
CVSROOT: /cvs/lvm2
Module name: LVM2
Changes by: mornfall@sourceware.org 2011-04-19 15:28:17
Modified files:
test : Makefile.in
Log message:
Always copy all tests to builddir regardless of T/S, since subsequent runs
(possibly with different T or S) skip that step.
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/test/Makefile.in.diff?cvsroot=lvm2&r1=1.53&r2=1.54
--- LVM2/test/Makefile.in 2011/01/17 15:18:10 1.53
+++ LVM2/test/Makefile.in 2011/04/19 15:28:17 1.54
@@ -29,6 +29,7 @@
T ?= .
S ?= @ # never match anything by default
VERBOSE ?= 0
+ALL = $(shell find $(srcdir) \( -name t-\*.sh -or -path */api/\*.sh \) | sort)
RUN = $(shell find $(srcdir) -regextype posix-egrep \( -name t-\*.sh -or -path */api/\*.sh \) -and -regex "$(srcdir)/.*($(T)).*" -and -not -regex "$(srcdir)/.*($(S)).*" | sort)
RUN_BASE = $(shell echo $(RUN) | xargs -n 1 echo | sed -e s,^$(srcdir)/,,)
@@ -80,10 +81,10 @@
lib/check lib/aux lib/test lib/utils lib/get lib/lvm-wrapper \
lib/paths
-.tests-stamp: $(RUN) $(LIB)
+.tests-stamp: $(ALL) $(LIB)
@if test "$(srcdir)" != . ; then \
echo "Copying tests to builddir."; \
- for f in $(RUN); do cp $$f `echo $$f | sed -e s,^$(srcdir)/,,`; done; \
+ for f in $(ALL); do cp $$f `echo $$f | sed -e s,^$(srcdir)/,,`; done; \
fi
touch .tests-stamp
^ permalink raw reply [flat|nested] 33+ messages in thread* LVM2/test Makefile.in
@ 2011-01-17 15:18 zkabelac
0 siblings, 0 replies; 33+ messages in thread
From: zkabelac @ 2011-01-17 15:18 UTC (permalink / raw)
To: lvm-devel, lvm2-cvs
CVSROOT: /cvs/lvm2
Module name: LVM2
Changes by: zkabelac@sourceware.org 2011-01-17 15:18:10
Modified files:
test : Makefile.in
Log message:
Remove -f from list of targets for cleanup
rm -f is already in used for this cleanup.
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/test/Makefile.in.diff?cvsroot=lvm2&r1=1.52&r2=1.53
--- LVM2/test/Makefile.in 2011/01/13 14:58:59 1.52
+++ LVM2/test/Makefile.in 2011/01/17 15:18:10 1.53
@@ -104,6 +104,6 @@
for i in lvm $$(cat ../tools/.commands); do rm -f lib/$$i; done
if test "$(srcdir)" != . ; then rm -f $(subst $(srcdir)/, ,$(RUN)) lvm2app.sh ; fi
-CLEAN_TARGETS += .lib-dir-stamp .test-stamp -f $(LIB) lib/dmsetup lib/clvmd lib/dmeventd
+CLEAN_TARGETS += .lib-dir-stamp .test-stamp $(LIB) lib/dmsetup lib/clvmd lib/dmeventd
.NOTPARALLEL:
^ permalink raw reply [flat|nested] 33+ messages in thread
* LVM2/test Makefile.in
@ 2011-01-13 14:59 zkabelac
0 siblings, 0 replies; 33+ messages in thread
From: zkabelac @ 2011-01-13 14:59 UTC (permalink / raw)
To: lvm-devel, lvm2-cvs
CVSROOT: /cvs/lvm2
Module name: LVM2
Changes by: zkabelac@sourceware.org 2011-01-13 14:58:59
Modified files:
test : Makefile.in
Log message:
Include default make.tmpl
Use default clean targets for this Makefile
Use also same build flags for compiling testing tools like harness.
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/test/Makefile.in.diff?cvsroot=lvm2&r1=1.51&r2=1.52
--- LVM2/test/Makefile.in 2011/01/07 12:26:02 1.51
+++ LVM2/test/Makefile.in 2011/01/13 14:58:59 1.52
@@ -24,6 +24,7 @@
abs_builddir = @abs_builddir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
+include $(top_builddir)/make.tmpl
T ?= .
S ?= @ # never match anything by default
@@ -59,7 +60,7 @@
ln -sf not lib/should
lib/%: $(srcdir)/lib/%.c .lib-dir-stamp
- $(CC) -o $@ $<
+ $(CC) $(DEFS) $(CFLAGS) -o $@ $<
lib/%: $(srcdir)/lib/%.sh .lib-dir-stamp
cp $< $@
@@ -100,13 +101,9 @@
touch $@
clean:
- rm -rf bin .lib-dir-stamp .test-stamp
- rm -f $(LIB)
- rm -f lib/dmsetup lib/clvmd lib/dmeventd
for i in lvm $$(cat ../tools/.commands); do rm -f lib/$$i; done
if test "$(srcdir)" != . ; then rm -f $(subst $(srcdir)/, ,$(RUN)) lvm2app.sh ; fi
-distclean: clean
- rm -f Makefile
+CLEAN_TARGETS += .lib-dir-stamp .test-stamp -f $(LIB) lib/dmsetup lib/clvmd lib/dmeventd
.NOTPARALLEL:
^ permalink raw reply [flat|nested] 33+ messages in thread
* LVM2/test Makefile.in
@ 2011-01-07 12:26 mornfall
0 siblings, 0 replies; 33+ messages in thread
From: mornfall @ 2011-01-07 12:26 UTC (permalink / raw)
To: lvm-devel, lvm2-cvs
CVSROOT: /cvs/lvm2
Module name: LVM2
Changes by: mornfall@sourceware.org 2011-01-07 12:26:02
Modified files:
test : Makefile.in
Log message:
Fix up the make clean target in test/.
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/test/Makefile.in.diff?cvsroot=lvm2&r1=1.50&r2=1.51
--- LVM2/test/Makefile.in 2011/01/05 00:16:18 1.50
+++ LVM2/test/Makefile.in 2011/01/07 12:26:02 1.51
@@ -101,6 +101,9 @@
clean:
rm -rf bin .lib-dir-stamp .test-stamp
+ rm -f $(LIB)
+ rm -f lib/dmsetup lib/clvmd lib/dmeventd
+ for i in lvm $$(cat ../tools/.commands); do rm -f lib/$$i; done
if test "$(srcdir)" != . ; then rm -f $(subst $(srcdir)/, ,$(RUN)) lvm2app.sh ; fi
distclean: clean
^ permalink raw reply [flat|nested] 33+ messages in thread
* LVM2/test Makefile.in
@ 2010-12-14 23:23 mornfall
0 siblings, 0 replies; 33+ messages in thread
From: mornfall @ 2010-12-14 23:23 UTC (permalink / raw)
To: lvm-devel, lvm2-cvs
CVSROOT: /cvs/lvm2
Module name: LVM2
Changes by: mornfall@sourceware.org 2010-12-14 23:23:45
Modified files:
test : Makefile.in
Log message:
Fix sed substitution in copying tests to builddir (test/Makefile.in).
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/test/Makefile.in.diff?cvsroot=lvm2&r1=1.48&r2=1.49
--- LVM2/test/Makefile.in 2010/12/14 17:38:42 1.48
+++ LVM2/test/Makefile.in 2010/12/14 23:23:45 1.49
@@ -93,7 +93,7 @@
@if test "$(srcdir)" != . ; then \
echo "Copying tests to builddir."; \
cp $(SUPPORT) .; \
- for f in $(RUN); do cp $$f `echo $$f | sed -e s,$(srcdir)/,,g`; done; \
+ for f in $(RUN); do cp $$f `echo $$f | sed -e s,^$(srcdir)/,,`; done; \
fi
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
^ permalink raw reply [flat|nested] 33+ messages in thread
* LVM2/test Makefile.in
@ 2010-12-14 17:38 mornfall
0 siblings, 0 replies; 33+ messages in thread
From: mornfall @ 2010-12-14 17:38 UTC (permalink / raw)
To: lvm-devel, lvm2-cvs
CVSROOT: /cvs/lvm2
Module name: LVM2
Changes by: mornfall@sourceware.org 2010-12-14 17:38:42
Modified files:
test : Makefile.in
Log message:
Hack up the RUN_BASE computation in the test Makefile.in a bit more (so that it
actually works... sometimes).
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/test/Makefile.in.diff?cvsroot=lvm2&r1=1.47&r2=1.48
--- LVM2/test/Makefile.in 2010/12/12 21:17:25 1.47
+++ LVM2/test/Makefile.in 2010/12/14 17:38:42 1.48
@@ -29,7 +29,7 @@
S ?= @ # never match anything by default
VERBOSE ?= 0
RUN = $(shell find $(srcdir) -regextype posix-egrep \( -name t-\*.sh -or -path */api/\*.sh \) -and -regex "$(srcdir)/.*($(T)).*" -and -not -regex "$(srcdir)/.*($(S)).*" | sort)
-RUN_BASE = $(shell echo $(RUN) | sed -e s,^$(srcdir)/,,)
+RUN_BASE = $(shell echo $(RUN) | xargs -n 1 echo | sed -e s,^$(srcdir)/,,)
# Shell quote;
SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH))
^ permalink raw reply [flat|nested] 33+ messages in thread
* LVM2/test Makefile.in
@ 2010-12-12 21:17 mornfall
0 siblings, 0 replies; 33+ messages in thread
From: mornfall @ 2010-12-12 21:17 UTC (permalink / raw)
To: lvm-devel, lvm2-cvs
CVSROOT: /cvs/lvm2
Module name: LVM2
Changes by: mornfall@sourceware.org 2010-12-12 21:17:25
Modified files:
test : Makefile.in
Log message:
Fix the sed expression to get "base" names of tests.
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/test/Makefile.in.diff?cvsroot=lvm2&r1=1.46&r2=1.47
--- LVM2/test/Makefile.in 2010/12/12 21:08:00 1.46
+++ LVM2/test/Makefile.in 2010/12/12 21:17:25 1.47
@@ -29,7 +29,7 @@
S ?= @ # never match anything by default
VERBOSE ?= 0
RUN = $(shell find $(srcdir) -regextype posix-egrep \( -name t-\*.sh -or -path */api/\*.sh \) -and -regex "$(srcdir)/.*($(T)).*" -and -not -regex "$(srcdir)/.*($(S)).*" | sort)
-RUN_BASE = $(shell echo $(RUN) | sed -e s,$(srcdir)/,,g)
+RUN_BASE = $(shell echo $(RUN) | sed -e s,^$(srcdir)/,,)
# Shell quote;
SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH))
^ permalink raw reply [flat|nested] 33+ messages in thread
* LVM2/test Makefile.in
@ 2010-10-12 16:17 mornfall
0 siblings, 0 replies; 33+ messages in thread
From: mornfall @ 2010-10-12 16:17 UTC (permalink / raw)
To: lvm-devel, lvm2-cvs
CVSROOT: /cvs/lvm2
Module name: LVM2
Changes by: mornfall@sourceware.org 2010-10-12 16:17:26
Modified files:
test : Makefile.in
Log message:
Add an option to skip some tests in make check (regex based, like T=): eg.
$ sudo make check S='mirror-basic|fsadm'
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/test/Makefile.in.diff?cvsroot=lvm2&r1=1.42&r2=1.43
--- LVM2/test/Makefile.in 2010/05/12 11:59:46 1.42
+++ LVM2/test/Makefile.in 2010/10/12 16:17:25 1.43
@@ -26,7 +26,8 @@
abs_top_srcdir = @abs_top_srcdir@
T ?= .
-RUN = $(shell find -regextype posix-egrep -name t-\*.sh -and -regex ".*($(T)).*" | sort)
+S ?= @ # never match anything by default
+RUN = $(shell find -regextype posix-egrep -name t-\*.sh -and -regex ".*($(T)).*" -and -not -regex ".*($(S)).*" | sort)
# Shell quote;
SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH))
^ permalink raw reply [flat|nested] 33+ messages in thread
* LVM2/test Makefile.in
@ 2010-05-12 11:59 mornfall
0 siblings, 0 replies; 33+ messages in thread
From: mornfall @ 2010-05-12 11:59 UTC (permalink / raw)
To: lvm-devel, lvm2-cvs
CVSROOT: /cvs/lvm2
Module name: LVM2
Changes by: mornfall@sourceware.org 2010-05-12 11:59:46
Modified files:
test : Makefile.in
Log message:
Run tests in alphabetical (and thus stable across machines) order.
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/test/Makefile.in.diff?cvsroot=lvm2&r1=1.41&r2=1.42
--- LVM2/test/Makefile.in 2010/05/12 11:23:16 1.41
+++ LVM2/test/Makefile.in 2010/05/12 11:59:46 1.42
@@ -26,7 +26,7 @@
abs_top_srcdir = @abs_top_srcdir@
T ?= .
-RUN = $(shell find -regextype posix-egrep -name t-\*.sh -and -regex ".*($(T)).*")
+RUN = $(shell find -regextype posix-egrep -name t-\*.sh -and -regex ".*($(T)).*" | sort)
# Shell quote;
SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH))
^ permalink raw reply [flat|nested] 33+ messages in thread
* LVM2/test Makefile.in
@ 2010-04-13 6:45 mornfall
0 siblings, 0 replies; 33+ messages in thread
From: mornfall @ 2010-04-13 6:45 UTC (permalink / raw)
To: lvm-devel, lvm2-cvs
CVSROOT: /cvs/lvm2
Module name: LVM2
Changes by: mornfall@sourceware.org 2010-04-13 06:45:53
Modified files:
test : Makefile.in
Log message:
Make it easy to run just a subset of tests by saying `make check T="regex"`.
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/test/Makefile.in.diff?cvsroot=lvm2&r1=1.36&r2=1.37
--- LVM2/test/Makefile.in 2010/04/12 19:02:59 1.36
+++ LVM2/test/Makefile.in 2010/04/13 06:45:53 1.37
@@ -25,6 +25,9 @@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
+T ?= .
+RUN = $(shell find -regextype posix-egrep -name t-\*.sh -and -regex ".*($(T)).*")
+
# Shell quote;
SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH))
@@ -45,9 +48,9 @@
all: init.sh
@echo Testing with locking_type 1
- ./bin/harness t-*.sh
+ ./bin/harness $(RUN)
@echo Testing with locking_type 3
- LVM_TEST_LOCKING=3 ./bin/harness t-*.sh
+ LVM_TEST_LOCKING=3 ./bin/harness $(RUN)
bin/not: $(srcdir)/not.c .bin-dir-stamp
$(CC) -o bin/not $<
@@ -74,7 +77,7 @@
echo 'export DM_UDEV_SYNCHRONISATION=$(dm_udev_synchronisation)' >> $@-t
chmod a-w $@-t
mv $@-t $@
- if test "$(srcdir)" != . ; then cp $(SCRIPTS) . ; fi
+ @if test "$(srcdir)" != . ; then echo "Copying tests to builddir."; cp $(SCRIPTS) . ; fi
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
^ permalink raw reply [flat|nested] 33+ messages in thread
* LVM2/test Makefile.in
@ 2010-03-31 23:05 zkabelac
0 siblings, 0 replies; 33+ messages in thread
From: zkabelac @ 2010-03-31 23:05 UTC (permalink / raw)
To: lvm-devel, lvm2-cvs
CVSROOT: /cvs/lvm2
Module name: LVM2
Changes by: zkabelac@sourceware.org 2010-03-31 23:05:21
Modified files:
test : Makefile.in
Log message:
Missed to convert T -> SCRIPTS
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/test/Makefile.in.diff?cvsroot=lvm2&r1=1.32&r2=1.33
--- LVM2/test/Makefile.in 2010/03/29 15:53:11 1.32
+++ LVM2/test/Makefile.in 2010/03/31 23:05:20 1.33
@@ -55,7 +55,7 @@
bin/harness: $(srcdir)/harness.c .bin-dir-stamp
$(CC) -o bin/harness $<
-init.sh: $(srcdir)/Makefile.in $(srcdir)/test-utils.sh .bin-dir-stamp bin/not bin/harness $(T)
+init.sh: $(srcdir)/Makefile.in .bin-dir-stamp bin/not bin/harness $(SCRIPTS)
rm -f $@-t $@
echo 'top_srcdir=$(top_srcdir)' >> $@-t
echo 'abs_top_builddir=$(abs_top_builddir)' >> $@-t
^ permalink raw reply [flat|nested] 33+ messages in thread
* LVM2/test Makefile.in
@ 2010-03-29 15:53 zkabelac
0 siblings, 0 replies; 33+ messages in thread
From: zkabelac @ 2010-03-29 15:53 UTC (permalink / raw)
To: lvm-devel, lvm2-cvs
CVSROOT: /cvs/lvm2
Module name: LVM2
Changes by: zkabelac@sourceware.org 2010-03-29 15:53:12
Modified files:
test : Makefile.in
Log message:
Fix also error code from clean:
And fix previous commit which missed test.
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/test/Makefile.in.diff?cvsroot=lvm2&r1=1.31&r2=1.32
--- LVM2/test/Makefile.in 2010/03/29 15:39:25 1.31
+++ LVM2/test/Makefile.in 2010/03/29 15:53:11 1.32
@@ -70,7 +70,7 @@
echo 'export DM_UDEV_SYNCHRONISATION=$(dm_udev_synchronisation)' >> $@-t
chmod a-w $@-t
mv $@-t $@
- if "$(srcdir)" != . ; then cp $(SCRIPTS) . ; fi
+ if test "$(srcdir)" != . ; then cp $(SCRIPTS) . ; fi
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
@@ -97,7 +97,7 @@
clean:
rm -rf init.sh lvm-wrapper bin .bin-dir-stamp
- test "$(srcdir)" != . && rm -f $(subst $(srcdir)/, ,$(SCRIPTS)) lvm2app.sh
+ if test "$(srcdir)" != . ; then rm -f $(subst $(srcdir)/, ,$(SCRIPTS)) lvm2app.sh ; fi
distclean: clean
rm -f Makefile
^ permalink raw reply [flat|nested] 33+ messages in thread
* LVM2/test Makefile.in
@ 2010-03-29 15:39 zkabelac
0 siblings, 0 replies; 33+ messages in thread
From: zkabelac @ 2010-03-29 15:39 UTC (permalink / raw)
To: lvm-devel, lvm2-cvs
CVSROOT: /cvs/lvm2
Module name: LVM2
Changes by: zkabelac@sourceware.org 2010-03-29 15:39:25
Modified files:
test : Makefile.in
Log message:
Oops, avoid returning errors from shell to makefile for builddir == srcdir
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/test/Makefile.in.diff?cvsroot=lvm2&r1=1.30&r2=1.31
--- LVM2/test/Makefile.in 2010/03/29 14:19:42 1.30
+++ LVM2/test/Makefile.in 2010/03/29 15:39:25 1.31
@@ -70,7 +70,7 @@
echo 'export DM_UDEV_SYNCHRONISATION=$(dm_udev_synchronisation)' >> $@-t
chmod a-w $@-t
mv $@-t $@
- test "$(srcdir)" != . && cp $(SCRIPTS) .
+ if "$(srcdir)" != . ; then cp $(SCRIPTS) . ; fi
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
^ permalink raw reply [flat|nested] 33+ messages in thread
* LVM2/test Makefile.in
@ 2010-03-29 14:19 zkabelac
0 siblings, 0 replies; 33+ messages in thread
From: zkabelac @ 2010-03-29 14:19 UTC (permalink / raw)
To: lvm-devel, lvm2-cvs
CVSROOT: /cvs/lvm2
Module name: LVM2
Changes by: zkabelac@sourceware.org 2010-03-29 14:19:42
Modified files:
test : Makefile.in
Log message:
Split long line in Makefile and keep $abs_top_buildir as shell variable
within init.sh.
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/test/Makefile.in.diff?cvsroot=lvm2&r1=1.29&r2=1.30
--- LVM2/test/Makefile.in 2010/03/29 14:18:01 1.29
+++ LVM2/test/Makefile.in 2010/03/29 14:19:42 1.30
@@ -60,8 +60,10 @@
echo 'top_srcdir=$(top_srcdir)' >> $@-t
echo 'abs_top_builddir=$(abs_top_builddir)' >> $@-t
echo 'abs_top_srcdir=$(abs_top_builddir)' >> $@-t
- echo 'PATH=$(abs_top_builddir)/test/bin:$$PATH' >> $@-t
- echo 'export LD_LIBRARY_PATH="$(abs_top_builddir)/libdm:$(abs_top_builddir)/liblvm:$(abs_top_builddir)/daemons/dmeventd"' >> $@-t
+ echo 'PATH=$$abs_top_builddir/test/bin:$$PATH' >> $@-t
+ LDLPATH="\$$abs_top_builddir/libdm"; \
+ LDLPATH="$$LDLPATH:\$$abs_top_builddir/daemons/dmeventd"; \
+ echo "export LD_LIBRARY_PATH=\"$$LDLPATH\"" >> $@-t
echo 'abs_srcdir=$(abs_srcdir)' >> $@-t
echo 'abs_builddir=$(abs_builddir)' >> $@-t
echo 'export PATH' >> $@-t
^ permalink raw reply [flat|nested] 33+ messages in thread
* LVM2/test Makefile.in
@ 2010-03-18 9:28 mornfall
0 siblings, 0 replies; 33+ messages in thread
From: mornfall @ 2010-03-18 9:28 UTC (permalink / raw)
To: lvm-devel, lvm2-cvs
CVSROOT: /cvs/lvm2
Module name: LVM2
Changes by: mornfall@sourceware.org 2010-03-18 09:28:43
Modified files:
test : Makefile.in
Log message:
Run both locking_type 1 and 3 tests (forgot to uncomment locking_type 1 before
last checkin).
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/test/Makefile.in.diff?cvsroot=lvm2&r1=1.27&r2=1.28
--- LVM2/test/Makefile.in 2010/03/18 09:19:33 1.27
+++ LVM2/test/Makefile.in 2010/03/18 09:28:42 1.28
@@ -43,7 +43,7 @@
all: init.sh
@echo Testing with locking_type 1
- #./bin/harness t-*.sh
+ ./bin/harness t-*.sh
@echo Testing with locking_type 3
LVM_TEST_LOCKING=3 ./bin/harness t-*.sh
^ permalink raw reply [flat|nested] 33+ messages in thread
* LVM2/test Makefile.in
@ 2009-11-30 16:58 mornfall
0 siblings, 0 replies; 33+ messages in thread
From: mornfall @ 2009-11-30 16:58 UTC (permalink / raw)
To: lvm-devel, lvm2-cvs
CVSROOT: /cvs/lvm2
Module name: LVM2
Changes by: mornfall@sourceware.org 2009-11-30 16:58:53
Modified files:
test : Makefile.in
Log message:
The sourcedir instances of the test scripts are not PHONY.
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/test/Makefile.in.diff?cvsroot=lvm2&r1=1.23&r2=1.24
--- LVM2/test/Makefile.in 2009/11/30 16:56:42 1.23
+++ LVM2/test/Makefile.in 2009/11/30 16:58:53 1.24
@@ -65,9 +65,6 @@
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-#$(T): init.sh
-# ./bin/harness $@
-
.bin-dir-stamp: lvm-wrapper
rm -rf bin
mkdir bin
@@ -93,5 +90,5 @@
distclean: clean
rm -f Makefile
-.PHONY: $(T) clean distclean
+.PHONY: clean distclean
.NOTPARALLEL:
^ permalink raw reply [flat|nested] 33+ messages in thread
* LVM2/test Makefile.in
@ 2009-11-30 16:56 mornfall
0 siblings, 0 replies; 33+ messages in thread
From: mornfall @ 2009-11-30 16:56 UTC (permalink / raw)
To: lvm-devel, lvm2-cvs
CVSROOT: /cvs/lvm2
Module name: LVM2
Changes by: mornfall@sourceware.org 2009-11-30 16:56:42
Modified files:
test : Makefile.in
Log message:
Don't fail in the builddir == srcdir case, though. (testsuite)
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/test/Makefile.in.diff?cvsroot=lvm2&r1=1.22&r2=1.23
--- LVM2/test/Makefile.in 2009/11/30 14:59:26 1.22
+++ LVM2/test/Makefile.in 2009/11/30 16:56:42 1.23
@@ -58,9 +58,9 @@
echo 'export PATH' >> $@-t
chmod a-w $@-t
mv $@-t $@
- test "$(srcdir)" != "." && cp $(srcdir)/test-utils.sh \
- $(srcdir)/test-lib.sh \
- $(T) .
+ if test "$(srcdir)" != "."; then cp $(srcdir)/test-utils.sh \
+ $(srcdir)/test-lib.sh \
+ $(T) .; fi
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
^ permalink raw reply [flat|nested] 33+ messages in thread
* LVM2/test Makefile.in
@ 2009-11-19 12:01 mornfall
0 siblings, 0 replies; 33+ messages in thread
From: mornfall @ 2009-11-19 12:01 UTC (permalink / raw)
To: lvm-devel, lvm2-cvs
CVSROOT: /cvs/lvm2
Module name: LVM2
Changes by: mornfall@sourceware.org 2009-11-19 12:01:39
Modified files:
test : Makefile.in
Log message:
Fix the dmeventd LD_LIBRARY_PATH in the testsuite.
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/test/Makefile.in.diff?cvsroot=lvm2&r1=1.20&r2=1.21
--- LVM2/test/Makefile.in 2009/11/02 15:16:21 1.20
+++ LVM2/test/Makefile.in 2009/11/19 12:01:39 1.21
@@ -40,7 +40,7 @@
echo 'abs_top_builddir=$(abs_top_builddir)' >> $@-t
echo 'abs_top_srcdir=$(abs_top_builddir)' >> $@-t
echo 'PATH=$(abs_top_builddir)/test/bin:$$PATH' >> $@-t
- echo 'export LD_LIBRARY_PATH="$(abs_top_builddir)/libdm:$(abs_top_builddir)/liblvm:$(abs_top_builddir)/dmeventd"' >> $@-t
+ echo 'export LD_LIBRARY_PATH="$(abs_top_builddir)/libdm:$(abs_top_builddir)/liblvm:$(abs_top_builddir)/daemons/dmeventd"' >> $@-t
echo 'abs_srcdir=$(abs_srcdir)' >> $@-t
echo 'abs_builddir=$(abs_builddir)' >> $@-t
echo 'export PATH' >> $@-t
^ permalink raw reply [flat|nested] 33+ messages in thread
* LVM2/test Makefile.in
@ 2009-11-02 15:16 mornfall
0 siblings, 0 replies; 33+ messages in thread
From: mornfall @ 2009-11-02 15:16 UTC (permalink / raw)
To: lvm-devel, lvm2-cvs
CVSROOT: /cvs/lvm2
Module name: LVM2
Changes by: mornfall@sourceware.org 2009-11-02 15:16:21
Modified files:
test : Makefile.in
Log message:
Rudimentary support for running testsuite in a builddir != srcdir situation.
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/test/Makefile.in.diff?cvsroot=lvm2&r1=1.19&r2=1.20
--- LVM2/test/Makefile.in 2009/09/15 19:59:05 1.19
+++ LVM2/test/Makefile.in 2009/11/02 15:16:21 1.20
@@ -26,15 +26,15 @@
abs_top_srcdir = @abs_top_srcdir@
all: init.sh
- ./bin/harness $(T)
+ ./bin/harness t-*.sh
-bin/not: .bin-dir-stamp not.c
- $(CC) -o bin/not not.c
+bin/not: $(srcdir)/not.c .bin-dir-stamp
+ $(CC) -o bin/not $<
-bin/harness: .bin-dir-stamp harness.c
- $(CC) -o bin/harness harness.c
+bin/harness: $(srcdir)/harness.c .bin-dir-stamp
+ $(CC) -o bin/harness $<
-init.sh: Makefile.in .bin-dir-stamp bin/not bin/harness
+init.sh: $(srcdir)/Makefile.in $(srcdir)/test-utils.sh .bin-dir-stamp bin/not bin/harness $(T)
rm -f $@-t $@
echo 'top_srcdir=$(top_srcdir)' >> $@-t
echo 'abs_top_builddir=$(abs_top_builddir)' >> $@-t
@@ -46,11 +46,14 @@
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 t-*.sh)
+T = $(wildcard $(srcdir)/t-*.sh)
ifeq ("@APPLIB@", "yes")
T += lvm2app.sh
@@ -62,13 +65,13 @@
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-$(T): init.sh
- ./bin/harness $@
+#$(T): init.sh
+# ./bin/harness $@
.bin-dir-stamp: lvm-wrapper
rm -rf bin
mkdir bin
- for i in lvm $$(cat $(top_srcdir)/tools/.commands); do \
+ for i in lvm $$(cat ../tools/.commands); do \
ln -s ../lvm-wrapper bin/$$i; \
done
ln -s "$(abs_top_builddir)/tools/dmsetup" bin/dmsetup
^ permalink raw reply [flat|nested] 33+ messages in thread* LVM2/test Makefile.in
@ 2008-11-07 1:30 mornfall
0 siblings, 0 replies; 33+ messages in thread
From: mornfall @ 2008-11-07 1:30 UTC (permalink / raw)
To: lvm-devel, lvm2-cvs
CVSROOT: /cvs/lvm2
Module name: LVM2
Changes by: mornfall@sourceware.org 2008-11-07 01:30:04
Modified files:
test : Makefile.in
Log message:
Set LD_LIBRARY_PATH in init.sh, as it is required to run dmsetup now as well,
which otherwise picks up the system version of libdevmapper, which is a pretty
bad idea.
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/test/Makefile.in.diff?cvsroot=lvm2&r1=1.13&r2=1.14
--- LVM2/test/Makefile.in 2008/11/04 14:37:10 1.13
+++ LVM2/test/Makefile.in 2008/11/07 01:30:03 1.14
@@ -34,6 +34,7 @@
echo 'abs_top_builddir=$(abs_top_builddir)' >> $@-t
echo 'abs_top_srcdir=$(abs_top_builddir)' >> $@-t
echo 'PATH=$(abs_top_builddir)/test/bin:$$PATH' >> $@-t
+ echo 'export LD_LIBRARY_PATH="$(abs_top_builddir)/libdm:$(abs_top_builddir)/dmeventd"' >> $@-t
echo 'abs_srcdir=$(abs_srcdir)' >> $@-t
echo 'abs_builddir=$(abs_builddir)' >> $@-t
echo 'export PATH' >> $@-t
@@ -63,7 +64,6 @@
lvm-wrapper: Makefile
rm -f $@-t $@
echo '#!/bin/sh' > $@-t
- echo 'export LD_LIBRARY_PATH="$(abs_top_builddir)/libdm:$(abs_top_builddir)/dmeventd"' >> $@-t
echo 'cmd=$$(echo ./$$0|sed "s,.*/,,")' >> $@-t
echo 'test "$$cmd" = lvm &&' >> $@-t
echo 'exec "$(abs_top_builddir)/tools/lvm" "$$@"' >> $@-t
^ permalink raw reply [flat|nested] 33+ messages in thread
* LVM2/test Makefile.in
@ 2008-11-04 14:37 mornfall
0 siblings, 0 replies; 33+ messages in thread
From: mornfall @ 2008-11-04 14:37 UTC (permalink / raw)
To: lvm-devel, lvm2-cvs
CVSROOT: /cvs/lvm2
Module name: LVM2
Changes by: mornfall@sourceware.org 2008-11-04 14:37:11
Modified files:
test : Makefile.in
Log message:
Use $(abs_top_builddir) instead of @DMDIR@ and update paths appropriately.
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/test/Makefile.in.diff?cvsroot=lvm2&r1=1.12&r2=1.13
--- LVM2/test/Makefile.in 2008/09/29 16:07:02 1.12
+++ LVM2/test/Makefile.in 2008/11/04 14:37:10 1.13
@@ -57,14 +57,13 @@
for i in lvm $$(cat $(top_srcdir)/tools/.commands); do \
ln -s ../lvm-wrapper bin/$$i; \
done
- test -n "@DMDIR@" && ln -s "@DMDIR@/dmsetup/dmsetup" bin/dmsetup
+ ln -s "$(abs_top_builddir)/tools/dmsetup" bin/dmsetup
touch $@
lvm-wrapper: Makefile
rm -f $@-t $@
echo '#!/bin/sh' > $@-t
- test -n "@DMDIR@" \
- && echo 'export LD_LIBRARY_PATH="@DMDIR@/lib:@DMDIR@/dmeventd"' >> $@-t
+ echo 'export LD_LIBRARY_PATH="$(abs_top_builddir)/libdm:$(abs_top_builddir)/dmeventd"' >> $@-t
echo 'cmd=$$(echo ./$$0|sed "s,.*/,,")' >> $@-t
echo 'test "$$cmd" = lvm &&' >> $@-t
echo 'exec "$(abs_top_builddir)/tools/lvm" "$$@"' >> $@-t
^ permalink raw reply [flat|nested] 33+ messages in thread
* LVM2/test Makefile.in
@ 2008-09-29 16:07 mornfall
0 siblings, 0 replies; 33+ messages in thread
From: mornfall @ 2008-09-29 16:07 UTC (permalink / raw)
To: lvm-devel, lvm2-cvs
CVSROOT: /cvs/lvm2
Module name: LVM2
Changes by: mornfall@sourceware.org 2008-09-29 16:07:02
Modified files:
test : Makefile.in
Log message:
Update test/Makefile.in to use the new harness for calling tests.
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/test/Makefile.in.diff?cvsroot=lvm2&r1=1.11&r2=1.12
--- LVM2/test/Makefile.in 2008/08/28 10:07:33 1.11
+++ LVM2/test/Makefile.in 2008/09/29 16:07:02 1.12
@@ -26,6 +26,8 @@
abs_top_srcdir = @abs_top_srcdir@
all: init.sh
+ sh harness.sh
+
init.sh: Makefile.in .bin-dir-stamp
rm -f $@-t $@
echo 'top_srcdir=$(top_srcdir)' >> $@-t
@@ -47,8 +49,7 @@
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
$(T): init.sh
- @echo "*** $@ ***"; '$(SHELL_PATH_SQ)' \
- $(TESTS_ENVIRONMENT) $@ $(LVM_TEST_OPTS)
+ sh harness.sh $@
.bin-dir-stamp: lvm-wrapper
rm -rf bin
@@ -76,6 +77,5 @@
distclean: clean
-all: $(T)
.PHONY: $(T) clean distclean
.NOTPARALLEL:
^ permalink raw reply [flat|nested] 33+ messages in thread
* LVM2/test Makefile.in
@ 2008-08-05 12:32 zkabelac
0 siblings, 0 replies; 33+ messages in thread
From: zkabelac @ 2008-08-05 12:32 UTC (permalink / raw)
To: lvm-devel, lvm2-cvs
CVSROOT: /cvs/lvm2
Module name: LVM2
Changes by: zkabelac@sourceware.org 2008-08-05 12:32:08
Modified files:
test : Makefile.in
Log message:
put dmeventd into the LD_LIBRARY_PATH for lvm-wrapper
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/test/Makefile.in.diff?cvsroot=lvm2&r1=1.9&r2=1.10
--- LVM2/test/Makefile.in 2008/06/27 19:24:17 1.9
+++ LVM2/test/Makefile.in 2008/08/05 12:32:08 1.10
@@ -63,7 +63,7 @@
rm -f $@-t $@
echo '#!/bin/sh' > $@-t
test -n "@DMDIR@" \
- && echo 'export LD_LIBRARY_PATH="@DMDIR@/lib"' >> $@-t
+ && echo 'export LD_LIBRARY_PATH="@DMDIR@/lib:@DMDIR@/dmeventd"' >> $@-t
echo 'cmd=$$(echo ./$$0|sed "s,.*/,,")' >> $@-t
echo 'test "$$cmd" = lvm &&' >> $@-t
echo 'exec "$(abs_top_builddir)/tools/lvm" "$$@"' >> $@-t
^ permalink raw reply [flat|nested] 33+ messages in thread
* LVM2/test Makefile.in
@ 2007-09-18 14:29 meyering
0 siblings, 0 replies; 33+ messages in thread
From: meyering @ 2007-09-18 14:29 UTC (permalink / raw)
To: lvm-devel, lvm2-cvs
CVSROOT: /cvs/lvm2
Module name: LVM2
Changes by: meyering@sourceware.org 2007-09-18 14:29:07
Modified files:
test : Makefile.in
Log message:
test/Makefile.in (lvm-wrapper): Use $(DMDIR)/lib/, not $(DMDIR)/lib/ioctl/.
Author: Jim Meyering <jim@meyering.net>
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/test/Makefile.in.diff?cvsroot=lvm2&r1=1.4&r2=1.5
--- LVM2/test/Makefile.in 2007/09/18 14:02:22 1.4
+++ LVM2/test/Makefile.in 2007/09/18 14:29:06 1.5
@@ -65,7 +65,7 @@
rm -f $@-t $@
echo '#!/bin/sh' > $@-t
test -n "@DMDIR@" \
- && echo 'export LD_LIBRARY_PATH="@DMDIR@/lib/ioctl"' >> $@-t
+ && echo 'export LD_LIBRARY_PATH="@DMDIR@/lib"' >> $@-t
echo 'cmd=$$(echo ./$$0|sed "s,.*/,,")' >> $@-t
echo 'test "$$cmd" = lvm &&' >> $@-t
echo 'exec "$(abs_top_builddir)/tools/lvm" "$$@"' >> $@-t
^ permalink raw reply [flat|nested] 33+ messages in thread
* LVM2/test Makefile.in
@ 2007-09-18 14:01 meyering
0 siblings, 0 replies; 33+ messages in thread
From: meyering @ 2007-09-18 14:01 UTC (permalink / raw)
To: lvm-devel, lvm2-cvs
CVSROOT: /cvs/lvm2
Module name: LVM2
Changes by: meyering@sourceware.org 2007-09-18 14:01:24
Modified files:
test : Makefile.in
Log message:
Clean up shared-lib support in test/.
* test/Makefile.in (so_name): Use @DMDIR@.
(.bin-dir-stamp): Create symlink only if @DMDIR@ is nonempty.
(lvm-wrapper): Emit LD_LIBRARY_PATH setting only if @DMDIR@ is nonempty.
Based on a patch from Jun'ichi Nomura.
Author: Jim Meyering <jim@meyering.net>
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/test/Makefile.in.diff?cvsroot=lvm2&r1=1.1&r2=1.2
--- LVM2/test/Makefile.in 2007/09/18 14:00:42 1.1
+++ LVM2/test/Makefile.in 2007/09/18 14:01:24 1.2
@@ -42,13 +42,13 @@
@echo "*** $@ ***"; '$(SHELL_PATH_SQ)' \
$(TESTS_ENVIRONMENT) $@ $(GIT_TEST_OPTS)
-dmdir = $(abs_top_srcdir)/../device-mapper
-so_name = $(dmdir)/lib/ioctl/libdevmapper.so.1.02
+so_name = @DMDIR@/lib/ioctl/libdevmapper.so.1.02
-# Having to create this link is a huge kludge,
+# Having to create this symlink is an ugly kludge,
# and a major argument for including device-mapper in lvm.
.bin-dir-stamp: lvm-wrapper
- ln -fs libdevmapper.so $(so_name)
+ test -n "@DMDIR@" \
+ && ln -fs libdevmapper.so $(so_name)
rm -rf bin
mkdir bin
for i in lvm $$(cat $(top_srcdir)/tools/.commands); do \
@@ -59,7 +59,8 @@
lvm-wrapper: Makefile
rm -f $@-t $@
echo '#!/bin/sh' >> $@-t
- echo 'export LD_LIBRARY_PATH="$(dmdir)/lib/ioctl"' >> $@-t
+ test -n "@DMDIR@" \
+ && echo 'export LD_LIBRARY_PATH="@DMDIR@/lib/ioctl"' >> $@-t
echo 'cmd=$$(echo ./$$0|sed "s,.*/,,")' >> $@-t
echo 'test "$$cmd" = lvm &&' >> $@-t
echo 'exec "$(abs_top_builddir)/tools/lvm" "$$@"' >> $@-t
^ permalink raw reply [flat|nested] 33+ messages in thread
end of thread, other threads:[~2012-03-14 17:14 UTC | newest]
Thread overview: 33+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-11-30 14:59 LVM2/test Makefile.in mornfall
-- strict thread matches above, loose matches on Subject: below --
2012-03-14 17:14 zkabelac
2011-11-23 13:03 zkabelac
2011-11-20 21:55 mornfall
2011-09-19 15:54 zkabelac
2011-09-19 12:50 zkabelac
2011-04-28 22:17 zkabelac
2011-04-21 17:42 wysochanski
2011-04-19 15:28 mornfall
2011-01-17 15:18 zkabelac
2011-01-13 14:59 zkabelac
2011-01-07 12:26 mornfall
2010-12-14 23:23 mornfall
2010-12-14 17:38 mornfall
2010-12-12 21:17 mornfall
2010-10-12 16:17 mornfall
2010-05-12 11:59 mornfall
2010-04-13 6:45 mornfall
2010-03-31 23:05 zkabelac
2010-03-29 15:53 zkabelac
2010-03-29 15:39 zkabelac
2010-03-29 14:19 zkabelac
2010-03-18 9:28 mornfall
2009-11-30 16:58 mornfall
2009-11-30 16:56 mornfall
2009-11-19 12:01 mornfall
2009-11-02 15:16 mornfall
2008-11-07 1:30 mornfall
2008-11-04 14:37 mornfall
2008-09-29 16:07 mornfall
2008-08-05 12:32 zkabelac
2007-09-18 14:29 meyering
2007-09-18 14:01 meyering
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).