diff mbox

tests/drv_suspend: Replace "&> /dev/null" with "> /dev/null 2>&1"

Message ID 1384184215-19252-1-git-send-email-oscar.mateo@intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

oscar.mateo@intel.com Nov. 11, 2013, 3:36 p.m. UTC 
From: Oscar Mateo <oscar.mateo@intel.com>

Some shells do not understand "&>". For instance, my Ubuntu 12.04
machine has /bin/sh pointing to dash, which makes a mess out of
"&>" (to the point that the helper processes cannot be killed).

Signed-off-by: Oscar Mateo <oscar.mateo@intel.com>
---
 tests/drv_suspend.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Lespiau, Damien Nov. 11, 2013, 6:27 p.m. UTC | #1 
On Mon, Nov 11, 2013 at 03:36:55PM +0000, oscar.mateo@intel.com wrote:
> From: Oscar Mateo <oscar.mateo@intel.com>
> 
> Some shells do not understand "&>". For instance, my Ubuntu 12.04
> machine has /bin/sh pointing to dash, which makes a mess out of
> "&>" (to the point that the helper processes cannot be killed).
> 
> Signed-off-by: Oscar Mateo <oscar.mateo@intel.com>

Looks good to me, pushed. Thanks for the patch.
diff mbox

Patch

diff --git a/tests/drv_suspend.c b/tests/drv_suspend.c
index e526e2a..9b3df2b 100644
--- a/tests/drv_suspend.c
+++ b/tests/drv_suspend.c
@@ -106,7 +106,7 @@  test_debugfs_reader(void)
 		static char tmp[1024];
 
 		snprintf(tmp, sizeof(tmp) - 1,
-			 "while true; do find %s/%i/ -type f | xargs cat &> /dev/null; done",
+			 "while true; do find %s/%i/ -type f | xargs cat > /dev/null 2>&1; done",
 			 dfs_base, drm_get_card());
 		assert(execl("/bin/sh", "sh", "-c", tmp, (char *) NULL) != -1);
 	}
@@ -131,7 +131,7 @@  test_sysfs_reader(void)
 		static char tmp[1024];
 
 		snprintf(tmp, sizeof(tmp) - 1,
-			 "while true; do find %s%i*/ -type f | xargs cat &> /dev/null; done",
+			 "while true; do find %s%i*/ -type f | xargs cat > /dev/null 2>&1; done",
 			 dfs_base, drm_get_card());
 		assert(execl("/bin/sh", "sh", "-c", tmp, (char *) NULL) != -1);
 	}