XFAIL some case-sensitive rename and move tests From: David Rothenberger --- subversion/tests/cmdline/copy_tests.py | 1 + subversion/tests/cmdline/svntest/main.py | 5 ++++- subversion/tests/libsvn_wc/op-depth-test.c | 4 ++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/subversion/tests/cmdline/copy_tests.py b/subversion/tests/cmdline/copy_tests.py index efc4dee..4f648fb 100755 --- a/subversion/tests/cmdline/copy_tests.py +++ b/subversion/tests/cmdline/copy_tests.py @@ -5285,6 +5285,7 @@ def copy_base_of_deleted(sbox): @Issue(3702) # APR's apr_filepath_merge() with APR_FILEPATH_TRUENAME is broken on OS X. @XFail(svntest.main.is_os_darwin) +@XFail(svntest.main.is_os_cygwin) def case_only_rename(sbox): """case-only rename""" diff --git a/subversion/tests/cmdline/svntest/main.py b/subversion/tests/cmdline/svntest/main.py index 38c03c5..f05844f 100644 --- a/subversion/tests/cmdline/svntest/main.py +++ b/subversion/tests/cmdline/svntest/main.py @@ -1641,8 +1641,11 @@ def is_posix_os(): def is_os_darwin(): return sys.platform == 'darwin' +def is_os_cygwin(): + return sys.platform == 'cygwin' + def is_fs_case_insensitive(): - return (is_os_darwin() or is_os_windows()) + return (is_os_darwin() or is_os_windows() or is_os_cygwin()) def is_threaded_python(): return True diff --git a/subversion/tests/libsvn_wc/op-depth-test.c b/subversion/tests/libsvn_wc/op-depth-test.c index 66e5928..71bbb9f 100644 --- a/subversion/tests/libsvn_wc/op-depth-test.c +++ b/subversion/tests/libsvn_wc/op-depth-test.c @@ -11933,11 +11933,11 @@ static struct svn_test_descriptor_t test_funcs[] = "test_shadowed_update"), SVN_TEST_OPTS_PASS(test_copy_of_deleted, "test_copy_of_deleted (issue #3873)"), -#ifndef DARWIN +#if !(defined(DARWIN) || defined(__CYGWIN__)) SVN_TEST_OPTS_PASS(test_case_rename, "test_case_rename on case (in)sensitive system"), #else - /* apr doesn't implement APR_FILEPATH_TRUENAME for MAC OS yet */ + /* apr doesn't implement APR_FILEPATH_TRUENAME for MAC OS or CYGWIN yet */ SVN_TEST_OPTS_XFAIL(test_case_rename, "test_case_rename on case (in)sensitive system"), #endif