[lvm-devel] [PATCH] Add lvm2app.sh to nightly testsuite.
Dave Wysochanski
dwysocha at redhat.com
Thu Sep 3 18:58:57 UTC 2009
More tests to come but for now just call into vgtest.
Fix warning in vgtest.c
Signed-off-by: Dave Wysochanski <dwysocha at redhat.com>
---
Makefile.in | 1 +
test/Makefile.in | 6 +++++-
test/api/vgtest.c | 2 +-
test/lvm2app.sh | 23 +++++++++++++++++++++++
4 files changed, 30 insertions(+), 2 deletions(-)
create mode 100755 test/lvm2app.sh
diff --git a/Makefile.in b/Makefile.in
index d6eec79..c0a5993 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -30,6 +30,7 @@ SUBDIRS += lib tools daemons libdm
ifeq ("@APPLIB@", "yes")
SUBDIRS += liblvm
+ SUBDIRS += test/api
endif
ifeq ($(MAKECMDGOALS),distclean)
diff --git a/test/Makefile.in b/test/Makefile.in
index aa4bab4..8731dbf 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -40,7 +40,7 @@ init.sh: Makefile.in .bin-dir-stamp bin/not bin/harness
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 'export LD_LIBRARY_PATH="$(abs_top_builddir)/libdm:$(abs_top_builddir)/liblvm:$(abs_top_builddir)/dmeventd"' >> $@-t
echo 'abs_srcdir=$(abs_srcdir)' >> $@-t
echo 'abs_builddir=$(abs_builddir)' >> $@-t
echo 'export PATH' >> $@-t
@@ -52,6 +52,10 @@ SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH))
T = $(wildcard t-*.sh)
+ifeq ("@APPLIB@", "yes")
+ T += lvm2app.sh
+endif
+
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
diff --git a/test/api/vgtest.c b/test/api/vgtest.c
index 7d2ac77..ab5ebf6 100644
--- a/test/api/vgtest.c
+++ b/test/api/vgtest.c
@@ -84,7 +84,7 @@ uint64_t size = 1024;
goto bad; \
}
-int init_vgtest(int argc, char *argv[])
+static int init_vgtest(int argc, char *argv[])
{
int i;
diff --git a/test/lvm2app.sh b/test/lvm2app.sh
new file mode 100755
index 0000000..1a9372b
--- /dev/null
+++ b/test/lvm2app.sh
@@ -0,0 +1,23 @@
+# Copyright (C) 2008 Red Hat, Inc. All rights reserved.
+#
+# This copyrighted material is made available to anyone wishing to use,
+# modify, copy, or redistribute it subject to the terms and conditions
+# of the GNU General Public License v.2.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+#
+# tests lvm2app library
+#
+
+. ./test-utils.sh
+
+aux prepare_devs 2
+
+pvcreate $dev1 $dev2
+
+echo `pwd`
+ls -lR `pwd`
+../api/vgtest $vg1 $dev1 $dev2
--
1.6.0.6
More information about the lvm-devel
mailing list