2 files changed, 21 insertions, 19 deletions
diff --git a/tests/gfid2path/gfid2path_fuse.t b/tests/gfid2path/gfid2path_fuse.t
index c7e79466673..d0fe1fc16ae 100644
--- a/tests/gfid2path/gfid2path_fuse.t
+++ b/tests/gfid2path/gfid2path_fuse.t
@@ -47,7 +47,7 @@ TEST $CLI_SETGFID2PATH $backpath
 #Check for the presence of xattr
 pgfid_bname=$pgfid/before_file1
 echo -n $pgfid_bname > $xxh64_file
-xxh64sum=$($XXHSUM_EXEC $xxh64_file | awk '{print $1}')
+xxh64sum=$(($XXHSUM_EXEC $xxh64_file) 2>/dev/null | awk '{print $1}')
 key="trusted.gfid2path.$xxh64sum"
 EXPECT $pgfid_bname get_text_xattr $key $backpath
 
@@ -62,7 +62,7 @@ backpath=$B0/${V0}1/file1
 #Check for the presence of xattr
 pgfid_bname=$pgfid/file1
 echo -n $pgfid_bname > $xxh64_file
-xxh64sum=$($XXHSUM_EXEC $xxh64_file | awk '{print $1}')
+xxh64sum=$(($XXHSUM_EXEC $xxh64_file) 2>/dev/null | awk '{print $1}')
 key="trusted.gfid2path.$xxh64sum"
 EXPECT $pgfid_bname get_text_xattr $key $backpath
 
@@ -74,7 +74,7 @@ backpath=$B0/${V0}1/mknod_file1
 #Check for the presence of xattr
 pgfid_bname=$pgfid/mknod_file1
 echo -n $pgfid_bname > $xxh64_file
-xxh64sum=$($XXHSUM_EXEC $xxh64_file | awk '{print $1}')
+xxh64sum=$(($XXHSUM_EXEC $xxh64_file) 2>/dev/null | awk '{print $1}')
 key="trusted.gfid2path.$xxh64sum"
 EXPECT $pgfid_bname get_text_xattr $key $backpath
 
@@ -88,13 +88,13 @@ backpath2=$B0/${V0}1/hl_file1
 #Check for the presence of two xattrs
 pgfid_bname=$pgfid/file1
 echo -n $pgfid_bname > $xxh64_file
-xxh64sum=$($XXHSUM_EXEC $xxh64_file | awk '{print $1}')
+xxh64sum=$(($XXHSUM_EXEC $xxh64_file) 2>/dev/null | awk '{print $1}')
 key="trusted.gfid2path.$xxh64sum"
 EXPECT $pgfid_bname get_text_xattr $key $backpath1
 
 pgfid_bname=$pgfid/hl_file1
 echo -n $pgfid_bname > $xxh64_file
-xxh64sum=$($XXHSUM_EXEC $xxh64_file | awk '{print $1}')
+xxh64sum=$(($XXHSUM_EXEC $xxh64_file) 2>/dev/null | awk '{print $1}')
 key="trusted.gfid2path.$xxh64sum"
 EXPECT $pgfid_bname get_text_xattr $key $backpath2
 
@@ -107,13 +107,13 @@ backpath=$B0/${V0}1/rn_file1
 #Check for the presence of new xattr
 pgfid_bname=$pgfid/file1
 echo -n $pgfid_bname > $xxh64_file
-xxh64sum=$($XXHSUM_EXEC $xxh64_file | awk '{print $1}')
+xxh64sum=$(($XXHSUM_EXEC $xxh64_file) 2>/dev/null | awk '{print $1}')
 key="trusted.gfid2path.$xxh64sum"
 EXPECT_NOT $pgfid_bname get_text_xattr $key $backpath
 
 pgfid_bname=$pgfid/rn_file1
 echo -n $pgfid_bname > $xxh64_file
-xxh64sum=$($XXHSUM_EXEC $xxh64_file | awk '{print $1}')
+xxh64sum=$(($XXHSUM_EXEC $xxh64_file) 2>/dev/null | awk '{print $1}')
 key="trusted.gfid2path.$xxh64sum"
 EXPECT $pgfid_bname get_text_xattr $key $backpath
 
@@ -126,13 +126,13 @@ backpath=$B0/${V0}1/rn_file1
 #Check removal of xattr
 pgfid_bname=$pgfid/hl_file1
 echo -n $pgfid_bname > $xxh64_file
-xxh64sum=$($XXHSUM_EXEC $xxh64_file | awk '{print $1}')
+xxh64sum=$(($XXHSUM_EXEC $xxh64_file) 2>/dev/null | awk '{print $1}')
 key="trusted.gfid2path.$xxh64sum"
 EXPECT_NOT $pgfid_bname get_text_xattr $key $backpath
 
 pgfid_bname=$pgfid/rn_file1
 echo -n $pgfid_bname > $xxh64_file
-xxh64sum=$($XXHSUM_EXEC $xxh64_file | awk '{print $1}')
+xxh64sum=$(($XXHSUM_EXEC $xxh64_file) 2>/dev/null | awk '{print $1}')
 key="trusted.gfid2path.$xxh64sum"
 EXPECT $pgfid_bname get_text_xattr $key $backpath
 
@@ -145,7 +145,7 @@ backpath=$B0/${V0}1/sym_file1
 #Check for the presence of xattr
 pgfid_bname=$pgfid/sym_file1
 echo -n $pgfid_bname > $xxh64_file
-xxh64sum=$($XXHSUM_EXEC $xxh64_file | awk '{print $1}')
+xxh64sum=$(($XXHSUM_EXEC $xxh64_file) 2>/dev/null | awk '{print $1}')
 key="trusted.gfid2path.$xxh64sum"
 EXPECT $pgfid_bname get_text_xattr $key $backpath
 
diff --git a/tests/gfid2path/gfid2path_nfs.t b/tests/gfid2path/gfid2path_nfs.t
index 239dafd46fb..d1ea7df2f4d 100644
--- a/tests/gfid2path/gfid2path_nfs.t
+++ b/tests/gfid2path/gfid2path_nfs.t
@@ -4,6 +4,8 @@
 . $(dirname $0)/../volume.rc
 . $(dirname $0)/../nfs.rc
 
+#G_TESTDEF_TEST_STATUS_CENTOS6=NFS_TEST
+
 cleanup;
 
 XXHSUM_SOURCE="$(dirname $0)/../../contrib/xxhash/xxhsum.c $(dirname $0)/../../contrib/xxhash/xxhash.c"
@@ -46,7 +48,7 @@ backpath=$B0/${V0}1/file1
 #Check for the presence of xattr
 pgfid_bname=$pgfid/file1
 echo -n $pgfid_bname > $xxh64_file
-xxh64sum=$($XXHSUM_EXEC $xxh64_file | awk '{print $1}')
+xxh64sum=$(($XXHSUM_EXEC $xxh64_file) 2>/dev/null | awk '{print $1}')
 key="trusted.gfid2path.$xxh64sum"
 EXPECT $pgfid_bname get_text_xattr $key $backpath
 
@@ -58,7 +60,7 @@ backpath=$B0/${V0}1/mknod_file1
 #Check for the presence of xattr
 pgfid_bname=$pgfid/mknod_file1
 echo -n $pgfid_bname > $xxh64_file
-xxh64sum=$($XXHSUM_EXEC $xxh64_file | awk '{print $1}')
+xxh64sum=$(($XXHSUM_EXEC $xxh64_file) 2>/dev/null | awk '{print $1}')
 key="trusted.gfid2path.$xxh64sum"
 EXPECT $pgfid_bname get_text_xattr $key $backpath
 
@@ -72,13 +74,13 @@ backpath2=$B0/${V0}1/hl_file1
 #Check for the presence of two xattrs
 pgfid_bname=$pgfid/file1
 echo -n $pgfid_bname > $xxh64_file
-xxh64sum=$($XXHSUM_EXEC $xxh64_file | awk '{print $1}')
+xxh64sum=$(($XXHSUM_EXEC $xxh64_file) 2>/dev/null | awk '{print $1}')
 key="trusted.gfid2path.$xxh64sum"
 EXPECT $pgfid_bname get_text_xattr $key $backpath1
 
 pgfid_bname=$pgfid/hl_file1
 echo -n $pgfid_bname > $xxh64_file
-xxh64sum=$($XXHSUM_EXEC $xxh64_file | awk '{print $1}')
+xxh64sum=$(($XXHSUM_EXEC $xxh64_file) 2>/dev/null | awk '{print $1}')
 key="trusted.gfid2path.$xxh64sum"
 EXPECT $pgfid_bname get_text_xattr $key $backpath2
 
@@ -91,13 +93,13 @@ backpath=$B0/${V0}1/rn_file1
 #Check for the presence of new xattr
 pgfid_bname=$pgfid/file1
 echo -n $pgfid_bname > $xxh64_file
-xxh64sum=$($XXHSUM_EXEC $xxh64_file | awk '{print $1}')
+xxh64sum=$(($XXHSUM_EXEC $xxh64_file) 2>/dev/null | awk '{print $1}')
 key="trusted.gfid2path.$xxh64sum"
 EXPECT_NOT $pgfid_bname get_text_xattr $key $backpath
 
 pgfid_bname=$pgfid/rn_file1
 echo -n $pgfid_bname > $xxh64_file
-xxh64sum=$($XXHSUM_EXEC $xxh64_file | awk '{print $1}')
+xxh64sum=$(($XXHSUM_EXEC $xxh64_file) 2>/dev/null | awk '{print $1}')
 key="trusted.gfid2path.$xxh64sum"
 EXPECT $pgfid_bname get_text_xattr $key $backpath
 
@@ -110,13 +112,13 @@ backpath=$B0/${V0}1/rn_file1
 #Check removal of xattr
 pgfid_bname=$pgfid/hl_file1
 echo -n $pgfid_bname > $xxh64_file
-xxh64sum=$($XXHSUM_EXEC $xxh64_file | awk '{print $1}')
+xxh64sum=$(($XXHSUM_EXEC $xxh64_file) 2>/dev/null | awk '{print $1}')
 key="trusted.gfid2path.$xxh64sum"
 EXPECT_NOT $pgfid_bname get_text_xattr $key $backpath
 
 pgfid_bname=$pgfid/rn_file1
 echo -n $pgfid_bname > $xxh64_file
-xxh64sum=$($XXHSUM_EXEC $xxh64_file | awk '{print $1}')
+xxh64sum=$(($XXHSUM_EXEC $xxh64_file) 2>/dev/null | awk '{print $1}')
 key="trusted.gfid2path.$xxh64sum"
 EXPECT $pgfid_bname get_text_xattr $key $backpath
 
@@ -129,7 +131,7 @@ backpath=$B0/${V0}1/sym_file1
 #Check for the presence of xattr
 pgfid_bname=$pgfid/sym_file1
 echo -n $pgfid_bname > $xxh64_file
-xxh64sum=$($XXHSUM_EXEC $xxh64_file | awk '{print $1}')
+xxh64sum=$(($XXHSUM_EXEC $xxh64_file) 2>/dev/null | awk '{print $1}')
 key="trusted.gfid2path.$xxh64sum"
 EXPECT $pgfid_bname get_text_xattr $key $backpath