rsync -a --delete should be much portable than cp -a

metze

git-svn-id: file:///home/svn/build-farm/trunk@659 1e5ffdc8-eadd-0310-9daa-9cb4117fe24b

diff --git a/build_test.fns b/build_test.fns
index cd63a4f762861f863087f95add1e306da46184fe..2c11f0bfb162cd2ab9acafda8810c52784015b9c 100644 (file)
--- a/build_test.fns
+++ b/build_test.fns
@@ -266,6 +266,12 @@ action_config_log() {
        return 0;
 }
 
+copy_dir() {
+       Tsrc=$1
+       Tdst=$2
+       rsync -a --delete $Tsrc/ $Tdst
+}
+
 s4selftest_create() {
        lock_file "$s4selftest.lck" || {
                return 1;
@@ -274,25 +280,25 @@ s4selftest_create() {
        rm -rf $s4selftest/
        mkdir -p $s4selftest/source
 
-       cp -a $builddir/bin $s4selftest/source/bin || {
+       copy_dir $builddir/bin $s4selftest/source/bin || {
                rm -rf $s4selftest/;
                unlock_file "$s4selftest.lck";
                return 1;
        }
 
-       cp -a $srcdir/setup $s4selftest/source/setup || {
+       copy_dir $srcdir/setup $s4selftest/source/setup || {
                rm -rf $s4selftest/;
                unlock_file "$s4selftest.lck";
                return 1;
        }
 
-       cp -a $srcdir/../testprogs $s4selftest/testprogs || {
+       copy_dir $srcdir/../testprogs $s4selftest/testprogs || {
                rm -rf $s4selftest/;
                unlock_file "$s4selftest.lck";
                return 1;
        }
 
-       cp -a $srcdir/selftest $s4selftest/source/selftest || {
+       copy_dir $srcdir/selftest $s4selftest/source/selftest || {
                rm -rf $s4selftest/;
                unlock_file "$s4selftest.lck";
                return 1;
@@ -304,7 +310,7 @@ s4selftest_create() {
                return 1;
        }
 
-       cp -a $srcdir/scripting/libjs $s4selftest/source/scripting/libjs || {
+       copy_dir $srcdir/scripting/libjs $s4selftest/source/scripting/libjs || {
                rm -rf $s4selftest/;
                unlock_file "$s4selftest.lck";
                return 1;
@@ -318,7 +324,7 @@ s4selftest_update() {
                return 1;
        }
 
-       cp -a $s4selftest $s4selftest.$tree.$compiler.$$ || {
+       copy_dir $s4selftest $s4selftest.$tree.$compiler.$$ || {
                rm -rf $s4selftest.$tree.$compiler.$$;
                unlock_file "$s4selftest.lck";
                return 1;