From: Milan Broz <mbroz@redhat.com>
Date: Fri, 27 Aug 2010 07:59:40 +0000 (+0000)
Subject: Currently tests require SI units enabled and data alignment to 1MiB.
X-Git-Tag: v2_02_74~14
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=72489fb4589e27444fd75b5ad7ad6a46762611e4;p=lvm2.git

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 c38e05f4d..8bcc98c11 100644
--- 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