# HG changeset patch # User Joerg Sonnenberger # Date 2020-04-10 17:52:33 # Node ID e5e5ee2b60e437ca9d8c7bd799daf1daec84f0e1 # Parent eb9026a84e8343c591b6717b8c8b518d5bdc3963 tests: skip CVS tests for root It is not uncommon for cvs to check for root and to refuse work in that case. Differential Revision: https://phab.mercurial-scm.org/D8395 diff --git a/tests/test-convert-cvs-branch.t b/tests/test-convert-cvs-branch.t --- a/tests/test-convert-cvs-branch.t +++ b/tests/test-convert-cvs-branch.t @@ -1,4 +1,4 @@ -#require cvs +#require cvs no-root This is https://bz.mercurial-scm.org/1148 and https://bz.mercurial-scm.org/1447 diff --git a/tests/test-convert-cvs-detectmerge.t b/tests/test-convert-cvs-detectmerge.t --- a/tests/test-convert-cvs-detectmerge.t +++ b/tests/test-convert-cvs-detectmerge.t @@ -1,4 +1,4 @@ -#require cvs +#require cvs no-root Test config convert.cvsps.mergefrom config setting. (Should test similar mergeto feature, but I don't understand it yet.) diff --git a/tests/test-convert-cvs-synthetic.t b/tests/test-convert-cvs-synthetic.t --- a/tests/test-convert-cvs-synthetic.t +++ b/tests/test-convert-cvs-synthetic.t @@ -1,4 +1,4 @@ -#require cvs112 +#require cvs112 no-root This feature requires use of builtin cvsps! diff --git a/tests/test-convert-cvs.t b/tests/test-convert-cvs.t --- a/tests/test-convert-cvs.t +++ b/tests/test-convert-cvs.t @@ -1,4 +1,4 @@ -#require cvs +#require cvs no-root $ cvscall() > { diff --git a/tests/test-convert-cvsnt-mergepoints.t b/tests/test-convert-cvsnt-mergepoints.t --- a/tests/test-convert-cvsnt-mergepoints.t +++ b/tests/test-convert-cvsnt-mergepoints.t @@ -1,4 +1,4 @@ -#require cvs +#require cvs no-root $ filterpath() > {