Matching the test invokes to rest of the project tests

Author: hugo-hur

Makefile.in

@@ -389,15 +389,15 @@ check-progs: all $(CHECK_PROGS) $(CHECK_SYMLINKS)
 
 .PHONY: check
 check: all $(CHECK_PROGS) $(CHECK_SYMLINKS)
-	$(srcdir)/runtests.py --rsync-bin=`pwd`/rsync$(EXEEXT) -j $(CHECK_J)
+	$(srcdir)/runtests.py --rsync-bin=`pwd`/rsync$(EXEEXT) -j $(CHECK_J) @LTFS_RUNTESTS_ARGS@
 
 .PHONY: check29
 check29: all $(CHECK_PROGS) $(CHECK_SYMLINKS)
-	$(srcdir)/runtests.py --rsync-bin=`pwd`/rsync$(EXEEXT) -j $(CHECK_J) --protocol=29
+	$(srcdir)/runtests.py --rsync-bin=`pwd`/rsync$(EXEEXT) -j $(CHECK_J) --protocol=29 @LTFS_RUNTESTS_ARGS@
 
 .PHONY: check30
 check30: all $(CHECK_PROGS) $(CHECK_SYMLINKS)
-	$(srcdir)/runtests.py --rsync-bin=`pwd`/rsync$(EXEEXT) -j $(CHECK_J) --protocol=30
+	$(srcdir)/runtests.py --rsync-bin=`pwd`/rsync$(EXEEXT) -j $(CHECK_J) --protocol=30 @LTFS_RUNTESTS_ARGS@
 
 # Whole-suite gcov coverage report (HTML, with branch + decision coverage).
 # Requires a build configured with --enable-coverage and the `gcovr` tool
@@ -412,7 +412,7 @@ coverage: all $(CHECK_PROGS) $(CHECK_SYMLINKS)
 	  *) echo "*** not a coverage build; reconfigure with --enable-coverage"; exit 1 ;; esac
 	@command -v gcovr >/dev/null 2>&1 || { echo "*** gcovr not found (pip install gcovr)"; exit 1; }
 	find . -name '*.gcda' -delete
-	@rc=0; $(srcdir)/runtests.py --rsync-bin=`pwd`/rsync$(EXEEXT) -j $(COVERAGE_J) $(COVERAGE_RUNFLAGS) || rc=$$?; \
+	@rc=0; $(srcdir)/runtests.py --rsync-bin=`pwd`/rsync$(EXEEXT) -j $(COVERAGE_J) $(COVERAGE_RUNFLAGS) @LTFS_RUNTESTS_ARGS@ || rc=$$?; \
 	  rm -rf $(COVERAGE_DIR) && mkdir -p $(COVERAGE_DIR); \
 	  gcovr --root $(srcdir) $(COVERAGE_EXCLUDE) --decisions --print-summary \
 	      --html-details -o $(COVERAGE_DIR)/index.html . || exit $$?; \
@@ -444,7 +444,7 @@ coverage-all: all $(CHECK_PROGS) $(CHECK_SYMLINKS)
 	@rc=0; \
 	  for cfg in '' '--protocol=30' '--protocol=29' '--use-tcp'; do \
 	    echo "===== coverage-all: runtests.py $$cfg ====="; \
-	    $(srcdir)/runtests.py --rsync-bin=`pwd`/rsync$(EXEEXT) -j $(COVERAGE_J) $$cfg || rc=$$?; \
+	    $(srcdir)/runtests.py --rsync-bin=`pwd`/rsync$(EXEEXT) -j $(COVERAGE_J) $$cfg @LTFS_RUNTESTS_ARGS@ || rc=$$?; \
 	  done; \
 	  rm -rf coverage-all && mkdir -p coverage-all; \
 	  gcovr --root $(srcdir) $(COVERAGE_EXCLUDE) --decisions --print-summary \
@@ -498,7 +498,7 @@ testsuite/exclude-lsh_test.py:
 
 .PHONY: installcheck
 installcheck: $(CHECK_PROGS) $(CHECK_SYMLINKS)
-	$(srcdir)/runtests.py --rsync-bin="$(bindir)/rsync$(EXEEXT)" --srcdir="$(srcdir)" --tooldir=`pwd` -j $(CHECK_J)
+	$(srcdir)/runtests.py --rsync-bin="$(bindir)/rsync$(EXEEXT)" --srcdir="$(srcdir)" --tooldir=`pwd` -j $(CHECK_J) @LTFS_RUNTESTS_ARGS@
 
 # TODO: Add 'dist' target; need to know which files will be included
 

configure

@@ -629,6 +629,7 @@ ac_unique_file="byteorder.h"
 ac_config_libobj_dir=lib
 : ${enable_year2038:=no}
 ac_subst_vars='LTLIBOBJS
+LTFS_RUNTESTS_ARGS
 LTFS_CHECK_OBJS
 LTFS_CHECK_PROGS
 MAKE_MAN
@@ -12575,19 +12576,23 @@ if test x"$enable_ltfs" != x"no" && test x"$enable_xattr_support" != x"no"; then
         *cygwin*)
             LTFS_CHECK_PROGS=''
             LTFS_CHECK_OBJS=''
+            LTFS_RUNTESTS_ARGS='--exclude=ltfs-server-reject,ltfs-client-compat'
             ;;
         *)
             LTFS_CHECK_PROGS='rsync_noltfs$(EXEEXT)'
             LTFS_CHECK_OBJS='options_noltfs.o'
+            LTFS_RUNTESTS_ARGS=''
             ;;
     esac
 else
     LTFS_CHECK_PROGS=''
     LTFS_CHECK_OBJS=''
+    LTFS_RUNTESTS_ARGS='--exclude=ltfs-server-reject,ltfs-client-compat'
 fi
 
 
 
+
 if test x"$enable_acl_support" = x"no" || test x"$enable_xattr_support" = x"no" || test x"$enable_iconv" = x"no"; then
     { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -Wno-unused-parameter" >&5
 printf %s "checking whether $CC supports -Wno-unused-parameter... " >&6; }

configure.ac

@@ -1490,18 +1490,22 @@ if test x"$enable_ltfs" != x"no" && test x"$enable_xattr_support" != x"no"; then
         *cygwin*)
             LTFS_CHECK_PROGS=''
             LTFS_CHECK_OBJS=''
+            LTFS_RUNTESTS_ARGS='--exclude=ltfs-server-reject,ltfs-client-compat'
             ;;
         *)
             LTFS_CHECK_PROGS='rsync_noltfs$(EXEEXT)'
             LTFS_CHECK_OBJS='options_noltfs.o'
+            LTFS_RUNTESTS_ARGS=''
             ;;
     esac
 else
     LTFS_CHECK_PROGS=''
     LTFS_CHECK_OBJS=''
+    LTFS_RUNTESTS_ARGS='--exclude=ltfs-server-reject,ltfs-client-compat'
 fi
 AC_SUBST(LTFS_CHECK_PROGS)
 AC_SUBST(LTFS_CHECK_OBJS)
+AC_SUBST(LTFS_RUNTESTS_ARGS)
 
 if test x"$enable_acl_support" = x"no" || test x"$enable_xattr_support" = x"no" || test x"$enable_iconv" = x"no"; then
     AC_MSG_CHECKING([whether $CC supports -Wno-unused-parameter])

testsuite/ltfs-client-compat_test.py

@@ -11,20 +11,17 @@
 # SUPPORT_XATTRS (which also suppresses SUPPORT_LTFS).  It acts as the
 # client here; the daemon runs the normal LTFS-capable build.
 
-import shutil
 import subprocess
 
 from rsyncfns import (
     FROMDIR, TODIR, TOOLDIR,
     build_rsyncd_conf, checkit, makepath, rsync_argv,
-    start_test_daemon, test_fail, test_skipped,
+    start_test_daemon, test_fail,
 )
 
 DAEMON_PORT = 12897
 
-noltfs_bin = shutil.which('rsync_noltfs', path=str(TOOLDIR))
-if noltfs_bin is None:
-    test_skipped(f"rsync_noltfs binary not found in TOOLDIR ({TOOLDIR})")
+noltfs_bin = str(TOOLDIR / 'rsync_noltfs')
 
 # --- setup -------------------------------------------------------------------
 

testsuite/ltfs-server-reject_test.py

@@ -8,20 +8,17 @@
 # local pipe (RSYNC_CONNECT_PROG) so no TCP socket or real LTFS volume is
 # needed, and the test runs on all platforms regardless of xattr support.
 
-import shutil
 import subprocess
 
 from rsyncfns import (
     FROMDIR, TODIR, TOOLDIR,
     build_rsyncd_conf, makepath, rsync_argv,
-    start_test_daemon, test_fail, test_skipped,
+    start_test_daemon, test_fail,
 )
 
 DAEMON_PORT = 12896
 
-noltfs_bin = shutil.which('rsync_noltfs', path=str(TOOLDIR))
-if noltfs_bin is None:
-    test_skipped(f"rsync_noltfs binary not found in TOOLDIR ({TOOLDIR})")
+noltfs_bin = str(TOOLDIR / 'rsync_noltfs')
 
 makepath(FROMDIR, TODIR)
 (FROMDIR / 'probe.txt').write_text('hello from the ltfs-server-reject test\n')