Set env vars for tests to disable udev checking

PATCH New Peter Rajnoha 1 participant 1 message Jan 8, 2010

Share & tools

Peter Rajnoha

author

2010-01-08 14:53 UTC #0 lore raw

PATCH 3/4 Set env vars for tests to disable udev checking

When configured with --enable-udev_sync, set env vars to disable udev checking for our tests since they use their own location for nodes and symlinks.

Peter

configure.in +1 -0

index 834fd6e..8db301c 100644
@@ -1130,6 +1130,7 @@ AC_SUBST(SNAPSHOTS)
 AC_SUBST(STATICDIR)
 AC_SUBST(STATIC_LINK)
 AC_SUBST(UDEV_RULES)
+AC_SUBST(UDEV_SYNC)
 AC_SUBST([LIB_PTHREAD])
 AC_SUBST(interface)
 AC_SUBST(kerneldir)

test/Makefile.in +7 -0

index 75366fd..6b7c76a 100644
@@ -30,6 +30,11 @@ SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH))
 
 T = $(wildcard $(srcdir)/t-*.sh)
 
+ifeq ("@UDEV_SYNC@", "yes")
+dm_udev_disable_checking = 1
+lvm_udev_disable_checking = 1
+endif
+
 ifeq ("@APPLIB@", "yes")
 T += $(srcdir)/lvm2app.sh
 all: api/vgtest

@@ -56,6 +61,8 @@ init.sh: $(srcdir)/Makefile.in $(srcdir)/test-utils.sh .bin-dir-stamp bin/not bi
 	echo 'abs_srcdir=$(abs_srcdir)' >> $@-t
 	echo 'abs_builddir=$(abs_builddir)' >> $@-t
 	echo 'export PATH' >> $@-t
+	echo 'export DM_UDEV_DISABLE_CHECKING=$(dm_udev_disable_checking)' >> $@-t
+	echo 'export LVM_UDEV_DISABLE_CHECKING=$(lvm_udev_disable_checking)' >> $@-t
 	chmod a-w $@-t
 	mv $@-t $@
 	if test "$(srcdir)" != "."; then cp $(srcdir)/test-utils.sh \