From a6bda3f36ad6d57bbce44333190839ddfc92319e Mon Sep 17 00:00:00 2001 From: dpmatthews Date: Fri, 8 Dec 2023 19:11:39 +0000 Subject: [PATCH] Fix --- t/fcm-conflicts/00-tree-add-add.t | 1 + t/fcm-conflicts/02-tree-delete-edit.t | 1 + t/fcm-conflicts/03-tree-delete-rename.t | 1 - t/fcm-conflicts/08-tree-rename-rename-diff.t | 1 + t/fcm-conflicts/09-tree-rename-rename-same.t | 1 + 5 files changed, 4 insertions(+), 1 deletion(-) diff --git a/t/fcm-conflicts/00-tree-add-add.t b/t/fcm-conflicts/00-tree-add-add.t index e5938a0e..90c832e3 100644 --- a/t/fcm-conflicts/00-tree-add-add.t +++ b/t/fcm-conflicts/00-tree-add-add.t @@ -22,6 +22,7 @@ . $(dirname $0)/test_header #------------------------------------------------------------------------------- check_svn_version +[[ $SVN_VERSION == "1.13.0" ]] && skip_all "Tests do not work with svn 1.13.0" tests 24 #------------------------------------------------------------------------------- setup diff --git a/t/fcm-conflicts/02-tree-delete-edit.t b/t/fcm-conflicts/02-tree-delete-edit.t index ab70829c..447190a2 100644 --- a/t/fcm-conflicts/02-tree-delete-edit.t +++ b/t/fcm-conflicts/02-tree-delete-edit.t @@ -22,6 +22,7 @@ . $(dirname $0)/test_header #------------------------------------------------------------------------------- check_svn_version +[[ $SVN_VERSION == "1.13.0" ]] && skip_all "Tests do not work with svn 1.13.0" tests 18 #------------------------------------------------------------------------------- setup diff --git a/t/fcm-conflicts/03-tree-delete-rename.t b/t/fcm-conflicts/03-tree-delete-rename.t index f0be5b6e..b4052b6c 100644 --- a/t/fcm-conflicts/03-tree-delete-rename.t +++ b/t/fcm-conflicts/03-tree-delete-rename.t @@ -22,7 +22,6 @@ . $(dirname $0)/test_header #------------------------------------------------------------------------------- check_svn_version -#[[ $SVN_VERSION == "1.13.0" ]] && skip_all "Tests not working with svn 1.13.0" tests 15 #------------------------------------------------------------------------------- setup diff --git a/t/fcm-conflicts/08-tree-rename-rename-diff.t b/t/fcm-conflicts/08-tree-rename-rename-diff.t index f60d5fc5..832a8544 100644 --- a/t/fcm-conflicts/08-tree-rename-rename-diff.t +++ b/t/fcm-conflicts/08-tree-rename-rename-diff.t @@ -22,6 +22,7 @@ . $(dirname $0)/test_header #------------------------------------------------------------------------------- check_svn_version +[[ $SVN_VERSION == "1.13.0" ]] && skip_all "Tests do not work with svn 1.13.0" tests 18 #------------------------------------------------------------------------------- setup diff --git a/t/fcm-conflicts/09-tree-rename-rename-same.t b/t/fcm-conflicts/09-tree-rename-rename-same.t index 342d8a14..bdc3fe66 100644 --- a/t/fcm-conflicts/09-tree-rename-rename-same.t +++ b/t/fcm-conflicts/09-tree-rename-rename-same.t @@ -23,6 +23,7 @@ . $(dirname $0)/test_header #------------------------------------------------------------------------------- check_svn_version +[[ $SVN_VERSION == "1.13.0" ]] && skip_all "Tests do not work with svn 1.13.0" tests 27 #------------------------------------------------------------------------------- setup