[CRIU] [crtools-bot for Cyrill Gorcunov ] zdtm: make zdtm to not fail if time changed in fd-list

Cyrill Gorcunov gorcunov at openvz.org
Mon Feb 20 05:23:28 EST 2012


The commit is pushed to "master" and will appear on git://github.com/cyrillos/crtools.git
------>
commit c1aad883debc02b1b491cfb8efe807b0caaf6173
Author: Cyrill Gorcunov <gorcunov at openvz.org>
Date:   Mon Feb 20 13:06:39 2012 +0400

    zdtm: make zdtm to not fail if time changed in fd-list
    
    In case if time is modified in ls -l output we should
    not treat it as error, interrupting zdtm work
    
    -lrwx------ 1 root root 64 Feb 17 14:52 0 -> /dev/null
    -lrwx------ 1 root root 64 Feb 17 14:52 1 -> /dev/null
    -lrwx------ 1 root root 64 Feb 17 14:52 2 -> /dev/null
    +lrwx------ 1 root root 64 Feb 17 14:53 0 -> /dev/null
    +lrwx------ 1 root root 64 Feb 17 14:53 1 -> /dev/null
    +lrwx------ 1 root root 64 Feb 17 14:53 2 -> /dev/null
    
    Signed-off-by: Cyrill Gorcunov <gorcunov at openvz.org>
    Acked-by: Andrew Vagin <avagin at parallels.com>
    Acked-by: Pavel Emelyanov <xemul at parallels.com>
---
 test/zdtm.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/test/zdtm.sh b/test/zdtm.sh
index eea5e22..901c15d 100644
--- a/test/zdtm.sh
+++ b/test/zdtm.sh
@@ -51,7 +51,7 @@ ARGS=""
 
 save_fds()
 {
-	ls -l /proc/$1/fd | sed 's/\(-> \(pipe\|socket\)\):.*/\1/' > $2
+	ls -l /proc/$1/fd | sed 's/\(-> \(pipe\|socket\)\):.*/\1/' | awk '{ print $9,$10,$11; }' > $2
 }
 
 diff_fds()


More information about the CRIU mailing list