[PATCH] common/{filter,quota}, xfs/1{06,52}: fix grep pattern

[Date Prev] [Date Next] [Thread Prev] [Thread Next] [Date Index] [Thread Index]



Newer(3.9) grep is complaining about these unnecessary
backslashes before # and -, and breaking the golden output.

Signed-off-by: Murphy Zhou <jencce.kernel@xxxxxxxxx>
---
 common/filter | 2 +-
 common/quota  | 2 +-
 tests/xfs/106 | 4 ++--
 tests/xfs/152 | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/filter b/common/filter
index 3e3fea7e..f10ba78a 100644
--- a/common/filter
+++ b/common/filter
@@ -293,7 +293,7 @@ _filter_project_quota()
 	# until the GETNEXTQUOTA ioctl came into use.  Filter it out.
 	# But if you specify a name for ID 0, that means you want to
 	# deal with it by yourself, this function won't filter it out.
-	_filter_quota | grep -v "^\#0 \|^(null) "
+	_filter_quota | grep -v "^#0 \|^(null) "
 }
 
 # Account for different "ln" failure messages
diff --git a/common/quota b/common/quota
index 96b8d044..0a526e07 100644
--- a/common/quota
+++ b/common/quota
@@ -191,7 +191,7 @@ _scratch_enable_pquota()
 _require_setquota_project()
 {
 	setquota --help 2>&1 | \
-		grep -q "\-P, \-\-project[[:space:]]*set limits for project"
+		grep -q "\-P, \--project[[:space:]]*set limits for project"
 	if [ "$?" -ne 0 ];then
 		_notrun "setquota doesn't support project quota (-P)"
 	fi
diff --git a/tests/xfs/106 b/tests/xfs/106
index fc2281af..388873bd 100755
--- a/tests/xfs/106
+++ b/tests/xfs/106
@@ -59,13 +59,13 @@ clean_files()
 
 filter_quot()
 {
-	_filter_quota | grep -v "root \|\#0 " \
+	_filter_quota | grep -v "root \|#0 " \
 		| sed -e '/#[0-9]*/s/#[0-9]*/#ID/g'
 }
 
 filter_report()
 {
-	_filter_quota | grep -v "^root \|^\#0 " \
+	_filter_quota | grep -v "^root \|^#0 " \
 		| sed -e '/^#[0-9]*/s/^#[0-9]*/#ID/g'
 }
 
diff --git a/tests/xfs/152 b/tests/xfs/152
index dd33801d..325a05c1 100755
--- a/tests/xfs/152
+++ b/tests/xfs/152
@@ -98,13 +98,13 @@ clean_files()
 
 filter_quot()
 {
-	_filter_quota | grep -v "root \|\#0 " \
+	_filter_quota | grep -v "root \|#0 " \
 		| sed -e '/#[0-9]*/s/#[0-9]*/#ID/g'
 }
 
 filter_report()
 {
-	_filter_quota | grep -v "^root \|^\#0 " \
+	_filter_quota | grep -v "^root \|^#0 " \
 		| sed -e '/^#[0-9]*/s/^#[0-9]*/#ID/g'
 }
 
-- 
2.31.1




[Index of Archives]     [Linux Filesystems Development]     [Linux NFS]     [Linux NILFS]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux