Skip to content

Commit 6a3a348

Browse files
dpmatthewsdpmatthews
authored
Merge pull request #267 from dpmatthews/svn-1.10
Enable all tests for svn 1.10
2 parents 8473820 + 010d415 commit 6a3a348

File tree

8 files changed

+31
-29
lines changed

8 files changed

+31
-29
lines changed

‎.github/workflows/tests.yaml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ jobs:
2525
libdbd-sqlite3-perl \
2626
python-subversion libsvn-perl \
2727
s-nail
28-
[[ ${{matrix.ubuntu}} != "ubuntu-20.04" ]] && sudo pip install 'trac' || true
28+
[[ ${{matrix.ubuntu}} == "ubuntu-16.04" ]] && sudo pip install 'trac==1.2' || true
29+
[[ ${{matrix.ubuntu}} == "ubuntu-18.04" ]] && sudo pip install 'trac' || true
2930
echo "#!/bin/bash" >"${PWD}/bin/gfortran"
3031
echo 'exec gfortran-9 "$@"' >>"${PWD}/bin/gfortran"
3132
chmod +x "${PWD}/bin/gfortran"

‎t/fcm-conflicts/00-tree-add-add.t‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
. $(dirname $0)/test_header
2323
#-------------------------------------------------------------------------------
2424
check_svn_version
25-
[[ $SVN_MINOR_VERSION == "1.10" ]] && skip_all "Tests not working with svn 1.10"
2625
tests 24
2726
#-------------------------------------------------------------------------------
2827
setup
@@ -49,14 +48,15 @@ fcm merge --non-interactive $ROOT_URL/branches/dev/Share/add_add >/dev/null
4948
run_pass "$TEST_KEY" fcm conflicts <<__IN__
5049
n
5150
__IN__
52-
file_cmp "$TEST_KEY.out" "$TEST_KEY.out" <<__OUT__
51+
file_cmp_filtered "$TEST_KEY.out" "$TEST_KEY.out" <<__OUT__
5352
[info] new_file: in tree conflict.
5453
Locally: added.
5554
Externally: added.
5655
Answer (y) to keep the local file filename.
5756
Answer (n) to keep the external file filename.
5857
Keep the local version?
59-
Enter "y" or "n" (or just press <return> for "n") Resolved conflicted state of 'new_file'
58+
#IF SVN1.8/9 Enter "y" or "n" (or just press <return> for "n") Resolved conflicted state of 'new_file'
59+
#IF SVN1.10 Enter "y" or "n" (or just press <return> for "n") Tree conflict at 'new_file' marked as resolved.
6060
__OUT__
6161
file_cmp "$TEST_KEY.err" "$TEST_KEY.err" </dev/null
6262
#-------------------------------------------------------------------------------

‎t/fcm-conflicts/02-tree-delete-edit.t‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
. $(dirname $0)/test_header
2323
#-------------------------------------------------------------------------------
2424
check_svn_version
25-
[[ $SVN_MINOR_VERSION == "1.10" ]] && skip_all "Tests not working with svn 1.10"
2625
tests 18
2726
#-------------------------------------------------------------------------------
2827
setup

‎t/fcm-conflicts/03-tree-delete-rename.t‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
. $(dirname $0)/test_header
2323
#-------------------------------------------------------------------------------
2424
check_svn_version
25-
[[ $SVN_MINOR_VERSION == "1.10" ]] && skip_all "Tests not working with svn 1.10"
2625
tests 15
2726
#-------------------------------------------------------------------------------
2827
setup
@@ -92,15 +91,16 @@ fcm merge --non-interactive $ROOT_URL/branches/dev/Share/del_ren >/dev/null
9291
run_pass "$TEST_KEY" fcm conflicts <<__IN__
9392
y
9493
__IN__
95-
file_cmp "$TEST_KEY.out" "$TEST_KEY.out" <<__OUT__
94+
file_cmp_filtered "$TEST_KEY.out" "$TEST_KEY.out" <<__OUT__
9695
[info] pro/hello.pro: in tree conflict.
9796
Locally: deleted.
9897
Externally: renamed to pro/hello.pro.renamed.
9998
Answer (y) to accept the local delete.
10099
Answer (n) to accept the external rename.
101100
Keep the local version?
102101
Enter "y" or "n" (or just press <return> for "n") Reverted 'pro/hello.pro.renamed'
103-
Resolved conflicted state of 'pro/hello.pro'
102+
#IF SVN1.8/9 Resolved conflicted state of 'pro/hello.pro'
103+
#IF SVN1.10 Tree conflict at 'pro/hello.pro' marked as resolved.
104104
__OUT__
105105
file_cmp "$TEST_KEY.err" "$TEST_KEY.err" </dev/null
106106
#-------------------------------------------------------------------------------

‎t/fcm-conflicts/05-tree-edit-rename.t‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
. $(dirname $0)/test_header
2323
#-------------------------------------------------------------------------------
2424
check_svn_version
25-
[[ $SVN_MINOR_VERSION == "1.10" ]] && skip_all "Tests not working with svn 1.10"
2625
tests 24
2726
#-------------------------------------------------------------------------------
2827
setup
@@ -125,7 +124,7 @@ fcm merge --non-interactive $ROOT_URL/branches/dev/Share/ed_ren >/dev/null
125124
run_pass "$TEST_KEY" fcm conflicts <<__IN__
126125
y
127126
__IN__
128-
file_cmp "$TEST_KEY.out" "$TEST_KEY.out" <<__OUT__
127+
file_cmp_filtered "$TEST_KEY.out" "$TEST_KEY.out" <<__OUT__
129128
[info] pro/hello.pro: in tree conflict.
130129
Locally: edited.
131130
Externally: renamed to pro/hello.pro.renamed.
@@ -142,7 +141,8 @@ Enter "y" or "n" (or just press <return> for "n") diff3 pro/hello.pro.working pr
142141
Merge contents (1)
143142
Merge contents (2)
144143
Reverted 'pro/hello.pro.renamed'
145-
Resolved conflicted state of 'pro/hello.pro'
144+
#IF SVN1.8/9 Resolved conflicted state of 'pro/hello.pro'
145+
#IF SVN1.10 Tree conflict at 'pro/hello.pro' marked as resolved.
146146
__OUT__
147147
file_cmp "$TEST_KEY.err" "$TEST_KEY.err" </dev/null
148148
#-------------------------------------------------------------------------------

‎t/fcm-conflicts/07-tree-rename-edit.t‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
. $(dirname $0)/test_header
2323
#-------------------------------------------------------------------------------
2424
check_svn_version
25-
[[ $SVN_MINOR_VERSION == "1.10" ]] && skip_all "Tests not working with svn 1.10"
2625
tests 18
2726
#-------------------------------------------------------------------------------
2827
setup
@@ -51,7 +50,7 @@ fcm merge --non-interactive $ROOT_URL/branches/dev/Share/ren_ed >/dev/null
5150
run_pass "$TEST_KEY" fcm conflicts <<__IN__
5251
n
5352
__IN__
54-
file_cmp "$TEST_KEY.out" "$TEST_KEY.out" <<__OUT__
53+
file_cmp_filtered "$TEST_KEY.out" "$TEST_KEY.out" <<__OUT__
5554
[info] pro/hello.pro: in tree conflict.
5655
Locally: renamed to pro/hello.pro.renamed.
5756
Externally: edited.
@@ -68,7 +67,8 @@ Enter "y" or "n" (or just press <return> for "n") diff3 pro/hello.pro.renamed.wo
6867
Merge contents (1)
6968
A pro/hello.pro
7069
D pro/hello.pro.renamed
71-
Resolved conflicted state of 'pro/hello.pro'
70+
#IF SVN1.8/9 Resolved conflicted state of 'pro/hello.pro'
71+
#IF SVN1.10 Tree conflict at 'pro/hello.pro' marked as resolved.
7272
__OUT__
7373
file_cmp "$TEST_KEY.err" "$TEST_KEY.err" </dev/null
7474
#-------------------------------------------------------------------------------
@@ -106,7 +106,7 @@ fcm merge --non-interactive $ROOT_URL/branches/dev/Share/ren_ed >/dev/null
106106
run_pass "$TEST_KEY" fcm conflicts <<__IN__
107107
y
108108
__IN__
109-
file_cmp "$TEST_KEY.out" "$TEST_KEY.out" <<__OUT__
109+
file_cmp_filtered "$TEST_KEY.out" "$TEST_KEY.out" <<__OUT__
110110
[info] pro/hello.pro: in tree conflict.
111111
Locally: renamed to pro/hello.pro.renamed.
112112
Externally: edited.
@@ -121,7 +121,8 @@ Enter "y" or "n" (or just press <return> for "n") diff3 pro/hello.pro.renamed.wo
121121
2:2a
122122
3:3c
123123
Merge contents (1)
124-
Resolved conflicted state of 'pro/hello.pro'
124+
#IF SVN1.8/9 Resolved conflicted state of 'pro/hello.pro'
125+
#IF SVN1.10 Tree conflict at 'pro/hello.pro' marked as resolved.
125126
__OUT__
126127
file_cmp "$TEST_KEY.err" "$TEST_KEY.err" </dev/null
127128
#-------------------------------------------------------------------------------

‎t/fcm-conflicts/08-tree-rename-rename-diff.t‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
. $(dirname $0)/test_header
2323
#-------------------------------------------------------------------------------
2424
check_svn_version
25-
[[ $SVN_MINOR_VERSION == "1.10" ]] && skip_all "Tests not working with svn 1.10"
2625
tests 18
2726
#-------------------------------------------------------------------------------
2827
setup
@@ -33,7 +32,7 @@ init_branch_wc ren_ren $REPOS_URL
3332
export FCM_GRAPHIC_MERGE=fcm-dummy-diff
3433
cd $TEST_DIR/wc
3534
#-------------------------------------------------------------------------------
36-
# Tests fcm conflicts: rename, rename, diff rename, discard local
35+
# Tests fcm conflicts: rename, diff rename, discard local
3736
TEST_KEY=$TEST_KEY_BASE-discard
3837
svn switch -q $ROOT_URL/branches/dev/Share/ctrl
3938
svn rename -q pro/hello.pro pro/hello.pro.renamed-local
@@ -54,7 +53,7 @@ fcm merge --non-interactive $ROOT_URL/branches/dev/Share/ren_ren >/dev/null
5453
run_pass "$TEST_KEY" fcm conflicts <<__IN__
5554
n
5655
__IN__
57-
file_cmp "$TEST_KEY.out" "$TEST_KEY.out" <<__OUT__
56+
file_cmp_filtered "$TEST_KEY.out" "$TEST_KEY.out" <<__OUT__
5857
[info] pro/hello.pro: in tree conflict.
5958
Locally: renamed to pro/hello.pro.renamed-local.
6059
Externally: renamed to pro/hello.pro.renamed-merge.
@@ -70,11 +69,12 @@ Enter "y" or "n" (or just press <return> for "n") diff3 pro/hello.pro.renamed-me
7069
3:3c
7170
Merge contents (1)
7271
D pro/hello.pro.renamed-local
73-
Resolved conflicted state of 'pro/hello.pro'
72+
#IF SVN1.8/9 Resolved conflicted state of 'pro/hello.pro'
73+
#IF SVN1.10 Tree conflict at 'pro/hello.pro' marked as resolved.
7474
__OUT__
7575
file_cmp "$TEST_KEY.err" "$TEST_KEY.err" </dev/null
7676
#-------------------------------------------------------------------------------
77-
# Tests fcm conflicts: rename, rename, diff rename, discard local (status)
77+
# Tests fcm conflicts: rename, diff rename, discard local (status)
7878
TEST_KEY=$TEST_KEY_BASE-discard-status
7979
run_pass "$TEST_KEY" svn status --config-dir=$TEST_DIR/.subversion/
8080
file_cmp "$TEST_KEY.out" "$TEST_KEY.out" <<__OUT__
@@ -84,7 +84,7 @@ A + pro/hello.pro.renamed-merge
8484
__OUT__
8585
file_cmp "$TEST_KEY.err" "$TEST_KEY.err" </dev/null
8686
#-------------------------------------------------------------------------------
87-
# Tests fcm conflicts: rename, rename, diff rename, discard local (cat)
87+
# Tests fcm conflicts: rename, diff rename, discard local (cat)
8888
TEST_KEY=$TEST_KEY_BASE-discard-cat
8989
run_pass "$TEST_KEY" cat pro/hello.pro.renamed-merge
9090
file_cmp "$TEST_KEY.out" "$TEST_KEY.out" <<__OUT__
@@ -100,13 +100,13 @@ mkdir $TEST_DIR/wc
100100
svn checkout -q $ROOT_URL/branches/dev/Share/ctrl $TEST_DIR/wc
101101
cd $TEST_DIR/wc
102102
#-------------------------------------------------------------------------------
103-
# Tests fcm conflicts: rename, rename, diff rename, keep local
103+
# Tests fcm conflicts: rename, diff rename, keep local
104104
TEST_KEY=$TEST_KEY_BASE-keep
105105
fcm merge --non-interactive $ROOT_URL/branches/dev/Share/ren_ren >/dev/null
106106
run_pass "$TEST_KEY" fcm conflicts <<__IN__
107107
y
108108
__IN__
109-
file_cmp "$TEST_KEY.out" "$TEST_KEY.out" <<__OUT__
109+
file_cmp_filtered "$TEST_KEY.out" "$TEST_KEY.out" <<__OUT__
110110
[info] pro/hello.pro: in tree conflict.
111111
Locally: renamed to pro/hello.pro.renamed-local.
112112
Externally: renamed to pro/hello.pro.renamed-merge.
@@ -122,19 +122,20 @@ Enter "y" or "n" (or just press <return> for "n") diff3 pro/hello.pro.renamed-lo
122122
3:3c
123123
Merge contents (1)
124124
Reverted 'pro/hello.pro.renamed-merge'
125-
Resolved conflicted state of 'pro/hello.pro'
125+
#IF SVN1.8/9 Resolved conflicted state of 'pro/hello.pro'
126+
#IF SVN1.10 Tree conflict at 'pro/hello.pro' marked as resolved.
126127
__OUT__
127128
file_cmp "$TEST_KEY.err" "$TEST_KEY.err" </dev/null
128129
#-------------------------------------------------------------------------------
129-
# Tests fcm conflicts: rename, rename, diff rename, keep local (status)
130+
# Tests fcm conflicts: rename, diff rename, keep local (status)
130131
TEST_KEY=$TEST_KEY_BASE-keep-status
131132
run_pass "$TEST_KEY" svn status --config-dir=$TEST_DIR/.subversion/
132133
file_cmp "$TEST_KEY.out" "$TEST_KEY.out" <<__OUT__
133134
M .
134135
__OUT__
135136
file_cmp "$TEST_KEY.err" "$TEST_KEY.err" </dev/null
136137
#-------------------------------------------------------------------------------
137-
# Tests fcm conflicts: rename, rename, diff rename, keep local (cat)
138+
# Tests fcm conflicts: rename, diff rename, keep local (cat)
138139
TEST_KEY=$TEST_KEY_BASE-keep-cat
139140
run_pass "$TEST_KEY" cat pro/hello.pro.renamed-local
140141
file_cmp "$TEST_KEY.out" "$TEST_KEY.out" <<__OUT__

‎t/fcm-conflicts/09-tree-rename-rename-same.t‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
. $(dirname $0)/test_header
2424
#-------------------------------------------------------------------------------
2525
check_svn_version
26-
[[ $SVN_MINOR_VERSION == "1.10" ]] && skip_all "Tests not working with svn 1.10"
2726
tests 27
2827
#-------------------------------------------------------------------------------
2928
setup
@@ -113,7 +112,8 @@ Externally: added.
113112
Answer (y) to keep the local file filename.
114113
Answer (n) to keep the external file filename.
115114
Keep the local version?
116-
Enter "y" or "n" (or just press <return> for "n") Resolved conflicted state of 'pro/hello.pro.renamed'
115+
#IF SVN1.8/9 Enter "y" or "n" (or just press <return> for "n") Resolved conflicted state of 'pro/hello.pro.renamed'
116+
#IF SVN1.10 Enter "y" or "n" (or just press <return> for "n") Tree conflict at 'pro/hello.pro.renamed' marked as resolved.
117117
__OUT__
118118
file_cmp "$TEST_KEY.err" "$TEST_KEY.err" </dev/null
119119
#-------------------------------------------------------------------------------

0 commit comments

Comments
 (0)