On 05/14/2015 03:14 PM, Pádraig Brady wrote: > --- a/tests/tail-2/inotify-rotate-resources.sh > +++ b/tests/tail-2/inotify-rotate-resources.sh > @@ -25,7 +25,7 @@ grep '^#define HAVE_INOTIFY 1' "$CONFIG_HEADER" >/dev/null \ > require_strace_ 'inotify_add_watch,inotify_rm_watch' > > # Quickly skip on remote file systems > -df --local . >/dev/null 2>&1 || > +is_local_dir . >/dev/null 2>&1 || > skip_ 'inotify not used on remote file system' > > check_tail_output()
That test is now skipped on a local ext4 file system: + is_local_dir . ./tests/tail-2/inotify-rotate-resources.sh: line 28: is_local_dir: command not found + skip_ 'inotify not used on remote file system' The attached fixes this: s/(is_local_dir)/\1_/ Have a nice day, Berny
>From 99dfd5a6616cbda93d1c8c917aa3158d8b82c25b Mon Sep 17 00:00:00 2001 From: Bernhard Voelker <[email protected]> Date: Thu, 14 May 2015 21:31:10 +0200 Subject: [PATCH] tests: fix check for local file system in inotify-rotate-resources.sh * tests/tail-2/inotify-rotate-resources.sh: s/(is_local_dir)/\1_/ --- tests/tail-2/inotify-rotate-resources.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/tail-2/inotify-rotate-resources.sh b/tests/tail-2/inotify-rotate-resources.sh index d6629a8..fe5d912 100755 --- a/tests/tail-2/inotify-rotate-resources.sh +++ b/tests/tail-2/inotify-rotate-resources.sh @@ -25,8 +25,7 @@ grep '^#define HAVE_INOTIFY 1' "$CONFIG_HEADER" >/dev/null \ require_strace_ 'inotify_add_watch,inotify_rm_watch' # Quickly skip on remote file systems -is_local_dir . >/dev/null 2>&1 || - skip_ 'inotify not used on remote file system' +is_local_dir_ . || skip_ 'inotify not used on remote file system' check_tail_output() { -- 2.1.4
