Commit f0e99650 authored by Pavel Emelyanov's avatar Pavel Emelyanov

zdtm: Some updates to treat NFS fds properly

First of all, silly-rename files' names may change, so
kludge the fds comparison properly.

Other than this, allow for linked-remaps on write_read10
test as it effectively generates such on NFS.
Signed-off-by: 's avatarPavel Emelyanov <xemul@parallels.com>
parent d47d93b2
...@@ -357,7 +357,7 @@ stop_test() ...@@ -357,7 +357,7 @@ stop_test()
save_fds() save_fds()
{ {
test -n "$PIDNS" && return 0 test -n "$PIDNS" && return 0
ls -l /proc/$1/fd | sed 's/\(-> \(pipe\|socket\)\):.*/\1/' | awk '{ print $9,$10,$11; }' > $2 ls -l /proc/$1/fd | sed 's/\(-> \(pipe\|socket\)\):.*/\1/' | sed -e 's/\/.nfs[0-9a-zA-Z]*/.nfs-silly-rename/' | awk '{ print $9,$10,$11; }' > $2
} }
save_maps() save_maps()
...@@ -401,6 +401,9 @@ run_test() ...@@ -401,6 +401,9 @@ run_test()
if [[ $1 =~ "unlink_" ]]; then if [[ $1 =~ "unlink_" ]]; then
linkremap="--link-remap" linkremap="--link-remap"
fi fi
if [[ $1 =~ "write_read10" ]]; then
linkremap="--link-remap"
fi
if [ -n "$MAINSTREAM_KERNEL" ] && [ $COMPILE_ONLY -eq 0 ] && echo $TEST_CR_KERNEL | grep -q ${test#ns/}; then if [ -n "$MAINSTREAM_KERNEL" ] && [ $COMPILE_ONLY -eq 0 ] && echo $TEST_CR_KERNEL | grep -q ${test#ns/}; then
echo "Skip $test" echo "Skip $test"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment