tests/drv_suspend: Replace "&> /dev/null" with "> /dev/null 2>&1"
authorOscar Mateo <oscar.mateo@intel.com>
Mon, 11 Nov 2013 15:36:55 +0000 (15:36 +0000)
committerDamien Lespiau <damien.lespiau@intel.com>
Mon, 11 Nov 2013 18:25:37 +0000 (18:25 +0000)
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 <damien.lespiau@intel.com>
Signed-off-by: Oscar Mateo <oscar.mateo@intel.com>
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
tests/drv_suspend.c

index e526e2a..9b3df2b 100644 (file)
@@ -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);
        }