Make remaining unstable tests fail consistently by adjusting the

modification time of the problematic file(s), causing the check_file()
routine to always hit the "file exists and is possible match" case.

While here, sync expected failures with reality.

diff --git a/regress/usr.bin/rsync/Makefile b/regress/usr.bin/rsync/Makefile
index dcf3d02..3be5644 100644 (file)
--- a/regress/usr.bin/rsync/Makefile
+++ b/regress/usr.bin/rsync/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2023/04/29 00:20:46 bluhm Exp $
+# $OpenBSD: Makefile,v 1.4 2023/07/16 06:36:18 anton Exp $
 
 # evaluate once in main make invocation, then get list of test from environment
 .if ! (make(clean) || make(cleandir) || make(obj))
@@ -13,27 +13,18 @@ clean:
        rm -rf dir* find*
 
 # some of these tests pass or fail unreliably
-REGRESS_EXPECTED_FAILURES =    run-openrsync-openrsync-test10_perms \
-                               run-openrsync-openrsync-test11_middlediff \
-                               run-openrsync-openrsync-test11b_middlediff \
-                               run-openrsync-openrsync-test3_minusexclude \
-                               run-openrsync-openrsync-test3b_minusexclude \
-                               run-openrsync-openrsync-test3c_minusexclude \
+REGRESS_EXPECTED_FAILURES =    run-openrsync-openrsync-test3_minusexclude \
                                run-openrsync-openrsync-test6_perms \
                                run-openrsync-openrsync-test6b_perms \
                                run-openrsync-openrsync-test7_symlinks \
-                               run-openrsync-openrsync-test7b_symlinks \
-                               run-openrsync-openrsync-test9_norecurse \
-                               run-openrsync-rsync-test10_perms \
-                               run-openrsync-rsync-test11_middlediff \
-                               run-openrsync-rsync-test11b_middlediff \
+                               run-openrsync-openrsync-test10_perms \
+                               run-openrsync-openrsync-test13_perms \
                                run-openrsync-rsync-test3_minusexclude \
                                run-openrsync-rsync-test6_perms \
                                run-openrsync-rsync-test6b_perms \
                                run-openrsync-rsync-test7_symlinks \
-                               run-rsync-openrsync-test12_inex \
-                               run-openrsync-rsync-test12c_inex \
-                               run-rsync-rsync-test3c_minusexclude
+                               run-openrsync-rsync-test10_perms \
+                               run-openrsync-rsync-test13_perms
 
 .if ! exists(${RSYNC_PORT})
 .for t in ${RSYNC_TESTS}

diff --git a/regress/usr.bin/rsync/test10_perms.test b/regress/usr.bin/rsync/test10_perms.test
index e7570f1..fea71d7 100644 (file)
--- a/regress/usr.bin/rsync/test10_perms.test
+++ b/regress/usr.bin/rsync/test10_perms.test
@@ -10,6 +10,7 @@ mkdir dir1
 cd dir1
 generate_tree_1
 chmod 640 foo/bar/baz/one.txt
+touch -m -t 199901020405 foo/bar/baz/one.txt
 # make the tree we want to compare to
 mkdir ../dir2
 cd ../dir2

diff --git a/regress/usr.bin/rsync/test6_perms.test b/regress/usr.bin/rsync/test6_perms.test
index 4c619fe..36f930b 100644 (file)
--- a/regress/usr.bin/rsync/test6_perms.test
+++ b/regress/usr.bin/rsync/test6_perms.test
@@ -19,7 +19,9 @@ mkdir ../dir3
 cd ../dir3
 generate_tree_1
 chmod 600 foo/bar/baz/one.txt
+touch -m -t 199901020405 foo/bar/baz/one.txt
 chmod 070 foo/bar/baz/one2.txt
+touch -m -t 199901020405 foo/bar/baz/one2.txt
 
 cd ..
 $rsync -a dir1/ dir3

diff --git a/regress/usr.bin/rsync/test6b_perms.test b/regress/usr.bin/rsync/test6b_perms.test
index 9a23281..bfaac6e 100644 (file)
--- a/regress/usr.bin/rsync/test6b_perms.test
+++ b/regress/usr.bin/rsync/test6b_perms.test
@@ -18,13 +18,17 @@ mkdir ../dir2
 cd ../dir2
 generate_tree_1
 chmod 600 foo/bar/baz/one.txt
+touch -m -t 199901020405 foo/bar/baz/one.txt
 chmod 777 foo/bar/baz/one2.txt
+touch -m -t 199901020405 foo/bar/baz/one2.txt
 
 mkdir ../dir3
 cd ../dir3
 generate_tree_1
 chmod 600 foo/bar/baz/one.txt
+touch -m -t 199901020405 foo/bar/baz/one.txt
 chmod 777 foo/bar/baz/one2.txt
+touch -m -t 199901020405 foo/bar/baz/one2.txt
 
 cd ..
 # call -a without -p.