From 33cd9ad54b6fe6ea5c988f01514f643805da9353 Mon Sep 17 00:00:00 2001
From: Wayne Davison <wayned@samba.org>
Date: Wed, 14 Mar 2007 00:22:05 +0000
Subject: [PATCH] I managed to duplicate the hang, so hopefully it's fixed now.
 Let's restore the full test suite and find out.

---
 testsuite/default-acls.test | 2 --
 testsuite/merge.test        | 8 ++++----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/testsuite/default-acls.test b/testsuite/default-acls.test
index 38ed2b79..1aa8d492 100644
--- a/testsuite/default-acls.test
+++ b/testsuite/default-acls.test
@@ -20,8 +20,6 @@ true) test_skipped "I don't know how to use your setfacl command" ;;
 esac
 setfacl $opts "$scratchdir" || test_skipped "Your filesystem has ACLs disabled"
 
-test_skipped "Skipping temporarily due to compile-farm timeouts"
-
 # Call as: testit <dirname> <default-acl> <file-expected> <program-expected>
 testit() {
     todir="$scratchdir/$1"
diff --git a/testsuite/merge.test b/testsuite/merge.test
index fdcace80..80598149 100644
--- a/testsuite/merge.test
+++ b/testsuite/merge.test
@@ -41,10 +41,10 @@ cp -p "$from2dir"/sub1/uno "$from3dir"/sub1/dos "$from2dir"/sub1/tres "$chkdir"/
 cp -p "$from3dir"/sub2/subby "$chkdir"/sub2
 
 # Get rid of any directory-time differences
-$RSYNC -av --no-ir --existing -f 'exclude,! */' "$from1dir/" "$from2dir/"
-$RSYNC -av --no-ir --existing -f 'exclude,! */' "$from2dir/" "$from3dir/"
-$RSYNC -av --no-ir --existing -f 'exclude,! */' "$from1dir/" "$chkdir/"
-$RSYNC -av --no-ir --existing -f 'exclude,! */' "$from3dir/" "$chkdir/"
+$RSYNC -av --existing -f 'exclude,! */' "$from1dir/" "$from2dir/"
+$RSYNC -av --existing -f 'exclude,! */' "$from2dir/" "$from3dir/"
+$RSYNC -av --existing -f 'exclude,! */' "$from1dir/" "$chkdir/"
+$RSYNC -av --existing -f 'exclude,! */' "$from3dir/" "$chkdir/"
 
 checkit "$RSYNC -aHvv \"$from1dir/\" \"$from2dir/\" \"$from3dir/\" \"$todir/\"" "$chkdir" "$todir"
 
-- 
2.34.1