From 4cc506f5eae66b812b7ad6e171524ff1d4f6feb4 Mon Sep 17 00:00:00 2001 From: Oscar Mateo Date: Mon, 11 Nov 2013 15:36:55 +0000 Subject: [PATCH] tests/drv_suspend: Replace "&> /dev/null" with "> /dev/null 2>&1" 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). Reviewed-by: Damien Lespiau Signed-off-by: Oscar Mateo Signed-off-by: Damien Lespiau --- tests/drv_suspend.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/drv_suspend.c b/tests/drv_suspend.c index e526e2a2..9b3df2be 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); }