From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <lvm2-cvs-return-2745-listarch-lvm2-cvs=sources.redhat.com@sourceware.org>
Received: (qmail 3642 invoked by alias); 22 Feb 2010 14:47:57 -0000
Received: (qmail 3618 invoked by uid 9699); 22 Feb 2010 14:47:56 -0000
Date: Mon, 22 Feb 2010 14:47:00 -0000
Message-ID: <20100222144756.3616.qmail@sourceware.org>
From: mornfall@sourceware.org
To: lvm-devel@redhat.com, lvm2-cvs@sourceware.org
Subject: LVM2/test t-pvcreate-operation.sh
Mailing-List: contact lvm2-cvs-help@sourceware.org; run by ezmlm
Precedence: bulk
List-Id: <lvm2-cvs.sourceware.org>
List-Subscribe: <mailto:lvm2-cvs-subscribe@sourceware.org>
List-Post: <mailto:lvm2-cvs@sourceware.org>
List-Help: <mailto:lvm2-cvs-help@sourceware.org>, <http://sourceware.org/lists.html#faqs>
Sender: lvm2-cvs-owner@sourceware.org
X-SW-Source: 2010-02/txt/msg00042.txt.bz2

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	mornfall@sourceware.org	2010-02-22 14:47:56

Modified files:
	test           : t-pvcreate-operation.sh 

Log message:
	Relax a check on blkid exit value, which seems to be different in different
	versions. Fixes a spurious test failure introduced with -o pipefail.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/test/t-pvcreate-operation.sh.diff?cvsroot=lvm2&r1=1.16&r2=1.17

--- LVM2/test/t-pvcreate-operation.sh	2009/06/06 16:40:39	1.16
+++ LVM2/test/t-pvcreate-operation.sh	2010/02/22 14:47:55	1.17
@@ -114,4 +114,5 @@
 mkswap $dev1
 blkid -c /dev/null $dev1 | grep "swap"
 pvcreate -f $dev1
-blkid -c /dev/null $dev1 | not grep "swap"
+# blkid cannot make up its mind whether not finding anything it knows is a failure or not
+(blkid -c /dev/null $dev1 || true) | not grep "swap"