From 0de68ebbe57132691c1508fe5ba5bd9290441c75 Mon Sep 17 00:00:00 2001 From: John Spray Date: Tue, 2 Jun 2015 18:53:14 +0100 Subject: [PATCH] qa: fix multiple_rsync.sh to avoid using /usr/ directly While we're at it, take only /usr/lib instead of all of /usr to keep the overall file count more modest. Fixes: #11807 Signed-off-by: John Spray --- qa/workunits/fs/misc/multiple_rsync.sh | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/qa/workunits/fs/misc/multiple_rsync.sh b/qa/workunits/fs/misc/multiple_rsync.sh index 4a1d0a183a65..e93e2f4fdfd7 100755 --- a/qa/workunits/fs/misc/multiple_rsync.sh +++ b/qa/workunits/fs/misc/multiple_rsync.sh @@ -1,16 +1,26 @@ #!/bin/sh -ex -sudo rsync -av --exclude local/ /usr/ usr.1 -sudo rsync -av --exclude local/ /usr/ usr.2 + +# Populate with some arbitrary files from the local system. Take +# a copy to protect against false fails from system updates during test. +export PAYLOAD=/tmp/multiple_rsync_payload.$$ +cp -r /usr/lib/ $PAYLOAD + +set -e + +sudo rsync -av $PAYLOAD payload.1 +sudo rsync -av $PAYLOAD payload.2 # this shouldn't transfer any additional files echo we should get 4 here if no additional files are transfered -sudo rsync -auv --exclude local/ /usr/ usr.1 | tee /tmp/$$ +sudo rsync -auv $PAYLOAD payload.1 | tee /tmp/$$ hexdump -C /tmp/$$ wc -l /tmp/$$ | grep 4 -sudo rsync -auv --exclude local/ /usr/ usr.2 | tee /tmp/$$ +sudo rsync -auv $PAYLOAD payload.2 | tee /tmp/$$ hexdump -C /tmp/$$ wc -l /tmp/$$ | grep 4 rm /tmp/$$ echo OK + +rm -rf $PAYLOAD -- 2.47.3