Currently tests require SI units enabled and data alignment to 1MiB.

For now force it in lvm.conf (otherwise it fails on older systems like RHEL5
where are these options disabled by default).

FIXME: it should test and detect both versions.

diff --git a/test/test-utils.sh b/test/test-utils.sh
index c38e05f4dcc597011adf7bae344dde701898cfde..8bcc98c11349f41eac6e6d95ccbc6ccc0a9da97b 100644 (file)
--- a/test/test-utils.sh
+++ b/test/test-utils.sh
@@ -366,6 +366,7 @@ prepare_lvmconf() {
     filter = $filter
     cache_dir = "$TESTDIR/etc"
     sysfs_scan = 0
+    default_data_alignment = 1
   }
   log {
     syslog = 0
@@ -384,6 +385,7 @@ prepare_lvmconf() {
     library_dir = "$TESTDIR/lib"
     locking_dir = "$TESTDIR/var/lock/lvm"
     $locktype
+    si_unit_consistency = 1
   }
   activation {
     udev_sync = 1