From patchwork Fri Mar 25 18:36:38 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josef Bacik X-Patchwork-Id: 8672751 Return-Path: X-Original-To: patchwork-fstests@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 007259F326 for ; Fri, 25 Mar 2016 18:36:48 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5EAC02035B for ; Fri, 25 Mar 2016 18:36:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B6AB720340 for ; Fri, 25 Mar 2016 18:36:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753472AbcCYSgn (ORCPT ); Fri, 25 Mar 2016 14:36:43 -0400 Received: from mx0b-00082601.pphosted.com ([67.231.153.30]:48048 "EHLO mx0b-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753207AbcCYSgm (ORCPT ); Fri, 25 Mar 2016 14:36:42 -0400 Received: from pps.filterd (m0001303.ppops.net [127.0.0.1]) by m0001303.ppops.net (8.16.0.11/8.16.0.11) with SMTP id u2PIXeSa002245 for ; Fri, 25 Mar 2016 11:36:41 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=fb.com; h=from : to : subject : date : message-id : mime-version : content-type; s=facebook; bh=TDBSNlUsCh3DQPc/X1fXLxrG7uRMgGwW9uHVi6ag1Bw=; b=YonRbMbgQ63ChrLHhe0LYtyy2XwsqkZ6bCc+lPfTWg0pYpVIodio3gPXpj4ql2vWyFc7 iPcXXEBr3Syo9t4tLMmy93YIzzjEwuyYQoCYuKUhfCa8TaWQ/A3Nojdn2JvVFt6C973v 2DoL6WAvhpLNd2bPATl4ZFpxIscuzyCRnlY= Received: from mail.thefacebook.com ([199.201.64.23]) by m0001303.ppops.net with ESMTP id 21vybh31km-1 (version=TLSv1 cipher=AES128-SHA bits=128 verify=NOT) for ; Fri, 25 Mar 2016 11:36:41 -0700 Received: from localhost (192.168.52.123) by mail.thefacebook.com (192.168.16.14) with Microsoft SMTP Server (TLS) id 14.3.248.2; Fri, 25 Mar 2016 11:36:39 -0700 From: Josef Bacik To: Subject: [PATCH] fstests: replace chattr with $CHATTR_PROG Date: Fri, 25 Mar 2016 14:36:38 -0400 Message-ID: <1458930998-22548-1-git-send-email-jbacik@fb.com> X-Mailer: git-send-email 2.5.0 MIME-Version: 1.0 X-Originating-IP: [192.168.52.123] X-Proofpoint-Spam-Reason: safe X-FB-Internal: Safe X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2016-03-25_05:, , signatures=0 Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Spam-Status: No, score=-7.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP We have a wrapper around chattr to make sure people don't do the wrong thing on their boxes, so we need to be able to specify CHATTR_PROG and have it actually work, so replace all chattr calls with $CHATTR_PROG. Signed-off-by: Josef Bacik --- tests/btrfs/024 | 2 +- tests/btrfs/059 | 4 ++-- tests/ext4/006 | 2 +- tests/ext4/007 | 2 +- tests/ext4/013 | 2 +- tests/ext4/014 | 2 +- tests/ext4/271 | 2 +- tests/generic/277 | 4 ++-- tests/shared/272 | 4 ++-- tests/xfs/083 | 2 +- tests/xfs/085 | 2 +- tests/xfs/086 | 4 ++-- tests/xfs/087 | 2 +- tests/xfs/088 | 4 ++-- tests/xfs/089 | 4 ++-- tests/xfs/091 | 4 ++-- tests/xfs/093 | 2 +- tests/xfs/097 | 2 +- tests/xfs/098 | 2 +- tests/xfs/099 | 2 +- tests/xfs/100 | 2 +- tests/xfs/101 | 2 +- tests/xfs/102 | 2 +- tests/xfs/105 | 2 +- tests/xfs/112 | 2 +- tests/xfs/113 | 2 +- tests/xfs/117 | 2 +- tests/xfs/120 | 2 +- tests/xfs/124 | 2 +- tests/xfs/125 | 2 +- tests/xfs/126 | 2 +- tests/xfs/130 | 2 +- tests/xfs/195 | 2 +- tests/xfs/235 | 2 +- 34 files changed, 41 insertions(+), 41 deletions(-) diff --git a/tests/btrfs/024 b/tests/btrfs/024 index 03d105a..42a55b7 100755 --- a/tests/btrfs/024 +++ b/tests/btrfs/024 @@ -54,7 +54,7 @@ __workout() work_file="$SCRATCH_MNT/tmpfile" touch $work_file - chattr =c $work_file + $CHATTR_PROG =c $work_file $XFS_IO_PROG -f -c "pwrite 0 1M" -c "fsync" $work_file | _filter_xfs_io } diff --git a/tests/btrfs/059 b/tests/btrfs/059 index b9a6ef4..d1b5a03 100755 --- a/tests/btrfs/059 +++ b/tests/btrfs/059 @@ -59,7 +59,7 @@ _scratch_mount mkdir $SCRATCH_MNT/testdir echo "Setting compression flag in the directory..." -chattr +c $SCRATCH_MNT/testdir +$CHATTR_PROG +c $SCRATCH_MNT/testdir echo "Directory compression property value:" $BTRFS_UTIL_PROG property get $SCRATCH_MNT/testdir compression @@ -68,7 +68,7 @@ echo "file1 compression property value:" $BTRFS_UTIL_PROG property get $SCRATCH_MNT/testdir/file1 compression echo "Clearing compression flag from directory..." -chattr -c $SCRATCH_MNT/testdir +$CHATTR_PROG -c $SCRATCH_MNT/testdir echo "Directory compression property value:" $BTRFS_UTIL_PROG property get $SCRATCH_MNT/testdir compression diff --git a/tests/ext4/006 b/tests/ext4/006 index b33a2b1..f6cca66 100755 --- a/tests/ext4/006 +++ b/tests/ext4/006 @@ -135,7 +135,7 @@ echo "++ mount image (2)" >> $ROUND2_LOG _scratch_mount >> $ROUND2_LOG 2>&1 echo "++ chattr -R -i" >> $ROUND2_LOG -chattr -R -f -i "${SCRATCH_MNT}/" > /dev/null 2>> $ROUND2_LOG +$CHATTR_PROG -R -f -i "${SCRATCH_MNT}/" > /dev/null 2>> $ROUND2_LOG echo "++ test scratch" >> $ROUND2_LOG _scratch_fuzz_test >> $ROUND2_LOG 2>&1 diff --git a/tests/ext4/007 b/tests/ext4/007 index 5c2b9e2..6719c8b 100755 --- a/tests/ext4/007 +++ b/tests/ext4/007 @@ -101,7 +101,7 @@ echo "+ mount image (2)" _scratch_mount echo "+ chattr -R -i" -chattr -R -f -i "${SCRATCH_MNT}/" +$CHATTR_PROG -R -f -i "${SCRATCH_MNT}/" echo "+ modify files (2)" broken=0 diff --git a/tests/ext4/013 b/tests/ext4/013 index 0c98142..de0929b 100755 --- a/tests/ext4/013 +++ b/tests/ext4/013 @@ -105,7 +105,7 @@ echo "+ mount image (2)" _scratch_mount echo "+ chattr -R -i" -chattr -R -f -i "${SCRATCH_MNT}/" +$CHATTR_PROG -R -f -i "${SCRATCH_MNT}/" echo "+ modify files (2)" broken=0 diff --git a/tests/ext4/014 b/tests/ext4/014 index 6c3fe6f..831bed4 100755 --- a/tests/ext4/014 +++ b/tests/ext4/014 @@ -103,7 +103,7 @@ echo "+ mount image (2)" _scratch_mount echo "+ chattr -R -i" -chattr -R -f -i "${SCRATCH_MNT}/" +$CHATTR_PROG -R -f -i "${SCRATCH_MNT}/" echo "+ modify files (2)" broken=0 diff --git a/tests/ext4/271 b/tests/ext4/271 index 844364f..d68c271 100755 --- a/tests/ext4/271 +++ b/tests/ext4/271 @@ -47,7 +47,7 @@ _scratch_mkfs_sized $((128 * 1024 * 1024)) >> $seqres.full 2>&1 # metadata sync writes inside ext4_handle_dirty_metadata() _scratch_mount -onoload touch $SCRATCH_MNT/file -chattr +S $SCRATCH_MNT/file +$CHATTR_PROG +S $SCRATCH_MNT/file # Create sparse file for ((i = 0; i < 21; i++)) do diff --git a/tests/generic/277 b/tests/generic/277 index 8e2a32f..4dfc431 100755 --- a/tests/generic/277 +++ b/tests/generic/277 @@ -54,8 +54,8 @@ _scratch_cycle_mount ctime1=`stat -c %z $SCRATCH_MNT/tmp` sleep 1 -chattr +A $SCRATCH_MNT/tmp -chattr -A $SCRATCH_MNT/tmp +$CHATTR_PROG +A $SCRATCH_MNT/tmp +$CHATTR_PROG -A $SCRATCH_MNT/tmp ctime2=`stat -c %z $SCRATCH_MNT/tmp` _scratch_cycle_mount diff --git a/tests/shared/272 b/tests/shared/272 index 8ec2c36..e5adf38 100755 --- a/tests/shared/272 +++ b/tests/shared/272 @@ -56,7 +56,7 @@ chattr_opt: $chattr_opt" >>$seqres.full dd if=/dev/zero of=$SCRATCH_MNT/file.$idx \ bs=1M count=4 $write_opt \ >> $seqres.full 2>&1 || exit - chattr $chattr_opt $SCRATCH_MNT/file.$idx >> $seqres.full \ + $CHATTR_PROG $chattr_opt $SCRATCH_MNT/file.$idx >> $seqres.full \ || exit done done @@ -73,7 +73,7 @@ chattr_opt: $chattr_opt" >>$seqres.full chattr_opt: $chattr_opt" >>$seqres.full dd if=/dev/zero of=$SCRATCH_MNT/file.$idx \ bs=1M $write_opt >> $seqres.full 2>&1 - chattr $chattr_opt $SCRATCH_MNT/file.$idx \ + $CHATTR_PROG $chattr_opt $SCRATCH_MNT/file.$idx \ >> $seqres.full || exit done sync diff --git a/tests/xfs/083 b/tests/xfs/083 index 8e14e88..d897754 100755 --- a/tests/xfs/083 +++ b/tests/xfs/083 @@ -148,7 +148,7 @@ echo "++ mount image (2)" >> $ROUND2_LOG _scratch_mount >> $ROUND2_LOG 2>&1 echo "++ chattr -R -i" >> $ROUND2_LOG -chattr -R -f -i "${SCRATCH_MNT}/" > /dev/null 2>> $ROUND2_LOG +$CHATTR_PROG -R -f -i "${SCRATCH_MNT}/" > /dev/null 2>> $ROUND2_LOG echo "+++ test scratch" >> $ROUND2_LOG _scratch_fuzz_test >> $ROUND2_LOG 2>&1 diff --git a/tests/xfs/085 b/tests/xfs/085 index 7352779..1ca5354 100755 --- a/tests/xfs/085 +++ b/tests/xfs/085 @@ -96,7 +96,7 @@ echo "+ mount image (2)" _scratch_mount echo "+ chattr -R -i" -chattr -R -f -i "${SCRATCH_MNT}/" +$CHATTR_PROG -R -f -i "${SCRATCH_MNT}/" echo "+ modify files (2)" broken=0 diff --git a/tests/xfs/086 b/tests/xfs/086 index 6c80368..143915b 100755 --- a/tests/xfs/086 +++ b/tests/xfs/086 @@ -107,7 +107,7 @@ echo "+ mount image" _scratch_mount echo "+ chattr -R -i" -chattr -R -f -i "${SCRATCH_MNT}/" +$CHATTR_PROG -R -f -i "${SCRATCH_MNT}/" echo "+ check files" broken=0 @@ -130,7 +130,7 @@ echo "+ mount image" _scratch_mount echo "+ chattr -R -i" -chattr -R -f -i "${SCRATCH_MNT}/" +$CHATTR_PROG -R -f -i "${SCRATCH_MNT}/" echo "+ check files (2)" broken=0 diff --git a/tests/xfs/087 b/tests/xfs/087 index 03d7635..97c6680 100755 --- a/tests/xfs/087 +++ b/tests/xfs/087 @@ -107,7 +107,7 @@ echo "+ mount image (2)" _scratch_mount echo "+ chattr -R -i" -chattr -R -f -i "${SCRATCH_MNT}/" +$CHATTR_PROG -R -f -i "${SCRATCH_MNT}/" echo "+ modify files (2)" broken=0 diff --git a/tests/xfs/088 b/tests/xfs/088 index e171ba9..18bf6ad 100755 --- a/tests/xfs/088 +++ b/tests/xfs/088 @@ -106,7 +106,7 @@ echo "+ mount image" _scratch_mount echo "+ chattr -R -i" -chattr -R -f -i "${SCRATCH_MNT}/" +$CHATTR_PROG -R -f -i "${SCRATCH_MNT}/" echo "+ check files" broken=0 @@ -129,7 +129,7 @@ echo "+ mount image" _scratch_mount echo "+ chattr -R -i" -chattr -R -f -i "${SCRATCH_MNT}/" +$CHATTR_PROG -R -f -i "${SCRATCH_MNT}/" echo "+ check files (2)" broken=0 diff --git a/tests/xfs/089 b/tests/xfs/089 index 4d41420..b6e512f 100755 --- a/tests/xfs/089 +++ b/tests/xfs/089 @@ -106,7 +106,7 @@ echo "+ mount image" _scratch_mount echo "+ chattr -R -i" -chattr -R -f -i "${SCRATCH_MNT}/" +$CHATTR_PROG -R -f -i "${SCRATCH_MNT}/" echo "+ check files" ls -la "${TESTDIR}" >> $seqres.full @@ -130,7 +130,7 @@ echo "+ mount image" _scratch_mount echo "+ chattr -R -i" -chattr -R -f -i "${SCRATCH_MNT}/" +$CHATTR_PROG -R -f -i "${SCRATCH_MNT}/" echo "+ check files (2)" broken=0 diff --git a/tests/xfs/091 b/tests/xfs/091 index edc54bd..f995d9c 100755 --- a/tests/xfs/091 +++ b/tests/xfs/091 @@ -106,7 +106,7 @@ echo "+ mount image" _scratch_mount echo "+ chattr -R -i" -chattr -R -f -i "${SCRATCH_MNT}/" +$CHATTR_PROG -R -f -i "${SCRATCH_MNT}/" echo "+ check files" ls -la "${TESTDIR}" >> $seqres.full @@ -130,7 +130,7 @@ echo "+ mount image" _scratch_mount echo "+ chattr -R -i" -chattr -R -f -i "${SCRATCH_MNT}/" +$CHATTR_PROG -R -f -i "${SCRATCH_MNT}/" echo "+ check files (2)" broken=0 diff --git a/tests/xfs/093 b/tests/xfs/093 index 9daf20f..7d4d9b8 100755 --- a/tests/xfs/093 +++ b/tests/xfs/093 @@ -107,7 +107,7 @@ echo "+ mount image (2)" _scratch_mount echo "+ chattr -R -i" -chattr -R -f -i "${SCRATCH_MNT}/" +$CHATTR_PROG -R -f -i "${SCRATCH_MNT}/" echo "+ modify files (2)" broken=0 diff --git a/tests/xfs/097 b/tests/xfs/097 index 88c8d5f..f5a8178 100755 --- a/tests/xfs/097 +++ b/tests/xfs/097 @@ -110,7 +110,7 @@ echo "+ mount image (2)" _scratch_mount echo "+ chattr -R -i" -chattr -R -f -i "${SCRATCH_MNT}/" +$CHATTR_PROG -R -f -i "${SCRATCH_MNT}/" echo "+ modify files (2)" broken=0 diff --git a/tests/xfs/098 b/tests/xfs/098 index fcfba11..d91d617 100755 --- a/tests/xfs/098 +++ b/tests/xfs/098 @@ -99,7 +99,7 @@ echo "+ mount image (2)" _scratch_mount echo "+ chattr -R -i" -chattr -R -f -i "${SCRATCH_MNT}/" +$CHATTR_PROG -R -f -i "${SCRATCH_MNT}/" echo "+ modify files (2)" broken=0 diff --git a/tests/xfs/099 b/tests/xfs/099 index 6118abf..36cf893 100755 --- a/tests/xfs/099 +++ b/tests/xfs/099 @@ -96,7 +96,7 @@ echo "+ mount image (2)" _scratch_mount echo "+ chattr -R -i" -chattr -R -f -i "${SCRATCH_MNT}/" +$CHATTR_PROG -R -f -i "${SCRATCH_MNT}/" echo "+ modify dir (2)" mkdir -p "${SCRATCH_MNT}/blockdir" diff --git a/tests/xfs/100 b/tests/xfs/100 index d5e3d3b..397c613 100755 --- a/tests/xfs/100 +++ b/tests/xfs/100 @@ -101,7 +101,7 @@ echo "+ mount image (2)" _scratch_mount echo "+ chattr -R -i" -chattr -R -f -i "${SCRATCH_MNT}/" +$CHATTR_PROG -R -f -i "${SCRATCH_MNT}/" echo "+ modify dir (2)" mkdir -p "${SCRATCH_MNT}/blockdir" diff --git a/tests/xfs/101 b/tests/xfs/101 index 99f4b8f..09af649 100755 --- a/tests/xfs/101 +++ b/tests/xfs/101 @@ -96,7 +96,7 @@ echo "+ mount image (2)" _scratch_mount echo "+ chattr -R -i" -chattr -R -f -i "${SCRATCH_MNT}/" +$CHATTR_PROG -R -f -i "${SCRATCH_MNT}/" echo "+ modify dir (2)" mkdir -p "${SCRATCH_MNT}/blockdir" diff --git a/tests/xfs/102 b/tests/xfs/102 index 641a96c..5d1965e 100755 --- a/tests/xfs/102 +++ b/tests/xfs/102 @@ -101,7 +101,7 @@ echo "+ mount image (2)" _scratch_mount echo "+ chattr -R -i" -chattr -R -f -i "${SCRATCH_MNT}/" +$CHATTR_PROG -R -f -i "${SCRATCH_MNT}/" echo "+ modify dir (2)" mkdir -p "${SCRATCH_MNT}/blockdir" diff --git a/tests/xfs/105 b/tests/xfs/105 index 2594ca3..516639a 100755 --- a/tests/xfs/105 +++ b/tests/xfs/105 @@ -101,7 +101,7 @@ echo "+ mount image (2)" _scratch_mount echo "+ chattr -R -i" -chattr -R -f -i "${SCRATCH_MNT}/" +$CHATTR_PROG -R -f -i "${SCRATCH_MNT}/" echo "+ modify dir (2)" mkdir -p "${SCRATCH_MNT}/blockdir" diff --git a/tests/xfs/112 b/tests/xfs/112 index 27ca6d8..aa7561e 100755 --- a/tests/xfs/112 +++ b/tests/xfs/112 @@ -105,7 +105,7 @@ echo "+ mount image (2)" _scratch_mount echo "+ chattr -R -i" -chattr -R -f -i "${SCRATCH_MNT}/" +$CHATTR_PROG -R -f -i "${SCRATCH_MNT}/" echo "+ modify dir (2)" mkdir -p "${SCRATCH_MNT}/blockdir" diff --git a/tests/xfs/113 b/tests/xfs/113 index 2127734..8aa3395 100755 --- a/tests/xfs/113 +++ b/tests/xfs/113 @@ -101,7 +101,7 @@ echo "+ mount image (2)" _scratch_mount echo "+ chattr -R -i" -chattr -R -f -i "${SCRATCH_MNT}/" +$CHATTR_PROG -R -f -i "${SCRATCH_MNT}/" echo "+ modify dir (2)" mkdir -p "${SCRATCH_MNT}/blockdir" diff --git a/tests/xfs/117 b/tests/xfs/117 index 5d827f0..27dafd9 100755 --- a/tests/xfs/117 +++ b/tests/xfs/117 @@ -109,7 +109,7 @@ echo "+ mount image (2)" _scratch_mount echo "+ chattr -R -i" -chattr -R -f -i "${SCRATCH_MNT}/" +$CHATTR_PROG -R -f -i "${SCRATCH_MNT}/" echo "+ modify files (2)" broken=0 diff --git a/tests/xfs/120 b/tests/xfs/120 index ca7b780..08a4615 100755 --- a/tests/xfs/120 +++ b/tests/xfs/120 @@ -94,7 +94,7 @@ echo "+ mount image (2)" _scratch_mount echo "+ chattr -R -i" -chattr -R -f -i "${SCRATCH_MNT}/" +$CHATTR_PROG -R -f -i "${SCRATCH_MNT}/" echo "+ modify files (2)" touch "${SCRATCH_MNT}/bigfile" diff --git a/tests/xfs/124 b/tests/xfs/124 index 07be1f3..239c246 100755 --- a/tests/xfs/124 +++ b/tests/xfs/124 @@ -100,7 +100,7 @@ echo "+ mount image (2)" _scratch_mount echo "+ chattr -R -i" -chattr -R -f -i "${SCRATCH_MNT}/" +$CHATTR_PROG -R -f -i "${SCRATCH_MNT}/" echo "+ modify xattr (2)" getfattr "${SCRATCH_MNT}/attrfile" -n "user.x00000000" > /dev/null 2>&1 && (setfattr -x "user.x00000000" "${SCRATCH_MNT}/attrfile" || _fail "remove corrupt xattr") diff --git a/tests/xfs/125 b/tests/xfs/125 index 8acd231..cf61e02 100755 --- a/tests/xfs/125 +++ b/tests/xfs/125 @@ -100,7 +100,7 @@ echo "+ mount image (2)" _scratch_mount echo "+ chattr -R -i" -chattr -R -f -i "${SCRATCH_MNT}/" +$CHATTR_PROG -R -f -i "${SCRATCH_MNT}/" echo "+ modify xattr (2)" setfattr -n "user.x00000000" -v "1111111111111111" "${SCRATCH_MNT}/attrfile" || _fail "modified corrupt xattr" diff --git a/tests/xfs/126 b/tests/xfs/126 index dd4d5bf..ebe84fc 100755 --- a/tests/xfs/126 +++ b/tests/xfs/126 @@ -105,7 +105,7 @@ echo "+ mount image (2)" _scratch_mount echo "+ chattr -R -i" -chattr -R -f -i "${SCRATCH_MNT}/" +$CHATTR_PROG -R -f -i "${SCRATCH_MNT}/" echo "+ modify xattr (2)" getfattr "${SCRATCH_MNT}/attrfile" -n "user.x00000000" 2> /dev/null && (setfattr -x "user.x00000000" "${SCRATCH_MNT}/attrfile" || _fail "modified corrupt xattr") diff --git a/tests/xfs/130 b/tests/xfs/130 index b64ea8c..7d8ea2a 100755 --- a/tests/xfs/130 +++ b/tests/xfs/130 @@ -94,7 +94,7 @@ echo "+ mount image (2)" _scratch_mount echo "+ chattr -R -i" -chattr -R -f -i "${SCRATCH_MNT}/" +$CHATTR_PROG -R -f -i "${SCRATCH_MNT}/" echo "+ reflink more (2)" _cp_reflink "${SCRATCH_MNT}/file1" "${SCRATCH_MNT}/file5" || \ diff --git a/tests/xfs/195 b/tests/xfs/195 index 21fcb00..3948ca4 100755 --- a/tests/xfs/195 +++ b/tests/xfs/195 @@ -76,7 +76,7 @@ echo "No dump exclude flag set (should not be skipped)" _do_dump echo "Dump exclude flag set, but no sync yet (should be skipped)" -chattr +d $TEST_DIR/d/t +$CHATTR_PROG +d $TEST_DIR/d/t _do_dump echo "Dump exclude flag set, after sync (should be skipped)" diff --git a/tests/xfs/235 b/tests/xfs/235 index 5af72a6..ae4933a 100755 --- a/tests/xfs/235 +++ b/tests/xfs/235 @@ -93,7 +93,7 @@ echo "+ mount image (2)" _scratch_mount echo "+ chattr -R -i" -chattr -R -f -i ${SCRATCH_MNT}/ +$CHATTR_PROG -R -f -i ${SCRATCH_MNT}/ echo "+ copy more (2)" cp -p ${SCRATCH_MNT}/file1 ${SCRATCH_MNT}/file5 || \