shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00
Code Releases Activity

Improvements

Browse Source 
Simplify RUN_BASE

Put .tests-stamp deps only for check target and fix its cleanup.
Fix abs_top_srcdir.
vgimportclone needs  srcdir.
Clean  api subdir.
This commit is contained in:
Zdenek Kabelac 2011-09-24 21:10:19 +00:00
parent 00e72fcfee
commit a4b6b51757
2 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
WHATS_NEW
View File

@ -1,5 +1,6 @@
Version 2.02.89 - Version 2.02.89 -
================================== ==================================
Improve testing Makefile.
Fix install_ocf make target when srcdir != builddir. (2.02.80) Fix install_ocf make target when srcdir != builddir. (2.02.80)
Support env vars LVM_CLVMD_BINARY and LVM_BINARY in clvmd. Support env vars LVM_CLVMD_BINARY and LVM_BINARY in clvmd.
Fix restart of clvmd (preserve exlusive locks). (2.02.64) Fix restart of clvmd (preserve exlusive locks). (2.02.64)

34
test/Makefile.in
View File

@ -1,4 +1,4 @@
# Copyright (C) 2007-2010 Red Hat, Inc. All rights reserved. # Copyright (C) 2007-2011 Red Hat, Inc. All rights reserved.
# #
# This file is part of LVM2. # This file is part of LVM2.
# #
@ -31,7 +31,7 @@ S ?= @ # never match anything by default
VERBOSE ?= 0 VERBOSE ?= 0
ALL = $(shell find $(srcdir) \( -name t-\*.sh -or -path */api/\*.sh \) | sort) 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 = $(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)/,,) RUN_BASE = $(subst $(srcdir)/,,$(RUN))
# Shell quote; # Shell quote;
SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH)) SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH))
@ -40,7 +40,9 @@ ifeq ("@UDEV_SYNC@", "yes")
dm_udev_synchronisation = 1 dm_udev_synchronisation = 1
endif endif
all check: .tests-stamp all: check
check: .tests-stamp
make -C api tests make -C api tests
@echo Testing with locking_type 1 @echo Testing with locking_type 1
VERBOSE=$(VERBOSE) ./lib/harness $(RUN_BASE) VERBOSE=$(VERBOSE) ./lib/harness $(RUN_BASE)
@ -71,7 +73,7 @@ lib/paths: $(srcdir)/Makefile.in .lib-dir-stamp
rm -f $@-t rm -f $@-t
echo 'top_srcdir=$(top_srcdir)' >> $@-t echo 'top_srcdir=$(top_srcdir)' >> $@-t
echo 'abs_top_builddir=$(abs_top_builddir)' >> $@-t echo 'abs_top_builddir=$(abs_top_builddir)' >> $@-t
echo 'abs_top_srcdir=$(abs_top_builddir)' >> $@-t echo 'abs_top_srcdir=$(abs_top_srcdir)' >> $@-t
echo 'abs_srcdir=$(abs_srcdir)' >> $@-t echo 'abs_srcdir=$(abs_srcdir)' >> $@-t
echo 'abs_builddir=$(abs_builddir)' >> $@-t echo 'abs_builddir=$(abs_builddir)' >> $@-t
echo 'export DM_UDEV_SYNCHRONISATION=$(dm_udev_synchronisation)' >> $@-t echo 'export DM_UDEV_SYNCHRONISATION=$(dm_udev_synchronisation)' >> $@-t
@ -81,35 +83,35 @@ LIB = lib/not lib/should lib/harness \
lib/check lib/aux lib/test lib/utils lib/get lib/lvm-wrapper \ lib/check lib/aux lib/test lib/utils lib/get lib/lvm-wrapper \
lib/paths lib/paths
CMDS = lvm $(shell cat $(top_builddir)/tools/.commands)
.tests-stamp: $(ALL) $(LIB) .tests-stamp: $(ALL) $(LIB)
@if test "$(srcdir)" != . ; then \ @if test "$(srcdir)" != . ; then \
echo "Copying tests to builddir."; \ echo "Copying tests to builddir."; \
for f in $(ALL); 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 fi
touch .tests-stamp touch $@
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
.lib-dir-stamp: .lib-dir-stamp: $(top_srcdir)/scripts/fsadm.sh
mkdir -p lib mkdir -p lib
for i in lvm $$(cat ../tools/.commands); do \ for i in $(CMDS); do ln -fs lvm-wrapper lib/$$i; done
ln -fs lvm-wrapper lib/$$i; \
done
ln -fs "$(abs_top_builddir)/tools/dmsetup" lib/dmsetup 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/clvmd/clvmd" lib/clvmd
ln -fs "$(abs_top_builddir)/daemons/dmeventd/dmeventd" lib/dmeventd 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)/daemons/lvmetad/lvmetad" lib/lvmetad
ln -fs "$(abs_top_builddir)/scripts/vgimportclone.sh" lib/vgimportclone ln -fs "$(abs_top_srcdir)/scripts/vgimportclone.sh" lib/vgimportclone
chmod +x "$(abs_top_builddir)/scripts/fsadm.sh" cp -f "$(top_srcdir)/scripts/fsadm.sh" lib/fsadm
ln -fs "$(abs_top_builddir)/scripts/fsadm.sh" lib/fsadm @chmod +x lib/fsadm
touch $@ touch $@
clean: clean:
for i in lvm $$(cat ../tools/.commands); do rm -f lib/$$i; done make -C api clean
if test "$(srcdir)" != . ; then rm -f $(subst $(srcdir)/, ,$(RUN)) lvm2app.sh ; fi test "$(srcdir)" != . && rm -f $(RUN_BASE) lvm2app.sh
CLEAN_TARGETS += .lib-dir-stamp .test-stamp $(LIB) \ CLEAN_TARGETS += .lib-dir-stamp .tests-stamp $(LIB) $(addprefix lib/,$(CMDS)) \
lib/dmsetup lib/clvmd lib/dmeventd lib/vgimportclone lib/fsadm lib/clvmd lib/dmeventd lib/dmsetup lib/lvmetad lib/fsadm lib/vgimportclone
.NOTPARALLEL: .NOTPARALLEL: