Further fixes in the testsuite

* tests/svncom00.at: Fix typo.
* tests/svncom01.at: Likewise.
* tests/svncom02.at: Likewise.
* tests/svncom03.at: Likewise.
* tests/svncom04.at: Likewise.
* tests/testsuite.at (AT_NONROOT_PREREQ): New macro.
(AT_VCS_PREREQ): Use AT_NONROOT_PREREQ for CVS.

6 files changed, 12 insertions, 10 deletions

diff --git a/tests/svncom00.at b/tests/svncom00.at
index 9245716..71e665c 100644
--- a/tests/svncom00.at
+++ b/tests/svncom00.at
@@ -1,5 +1,5 @@
 # This file is part of Vcsync testsuite. -*- Autotest -*-
-# Copyright (C) 2014 Sergey Poznyakoff
+# Copyright (C) 2014,2019 Sergey Poznyakoff
 #
 # Vcsync is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -18,7 +18,7 @@ AT_SETUP([modify top level directory files])
 AT_KEYWORDS([svn svncom svncom00])
 
 AT_CHECK([
-AT_VCS_PREREQ(CVS)
+AT_VCS_PREREQ(SVN)
 cwd=$(pwd)
 SVN_COM_INIT
 cd test
diff --git a/tests/svncom01.at b/tests/svncom01.at
index 37c82a7..a621d17 100644
--- a/tests/svncom01.at
+++ b/tests/svncom01.at
@@ -1,5 +1,5 @@
 # This file is part of Vcsync testsuite. -*- Autotest -*-
-# Copyright (C) 2014 Sergey Poznyakoff
+# Copyright (C) 2014,2019 Sergey Poznyakoff
 #
 # Vcsync is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -18,7 +18,7 @@ AT_SETUP([add files])
 AT_KEYWORDS([svn svncom svncom01])
 
 AT_CHECK([
-AT_VCS_PREREQ(CVS)
+AT_VCS_PREREQ(SVN)
 cwd=$(pwd)
 SVN_COM_INIT
 cd test
diff --git a/tests/svncom02.at b/tests/svncom02.at
index 7bb3aae..e7c79ef 100644
--- a/tests/svncom02.at
+++ b/tests/svncom02.at
@@ -1,5 +1,5 @@
 # This file is part of Vcsync testsuite. -*- Autotest -*-
-# Copyright (C) 2014 Sergey Poznyakoff
+# Copyright (C) 2014,2019 Sergey Poznyakoff
 #
 # Vcsync is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -18,7 +18,7 @@ AT_SETUP([remove files])
 AT_KEYWORDS([svn svncom svncom02])
 
 AT_CHECK([
-AT_VCS_PREREQ(CVS)
+AT_VCS_PREREQ(SVN)
 cwd=$(pwd)
 SVN_COM_INIT
 cd test
diff --git a/tests/svncom03.at b/tests/svncom03.at
index 7fe9542..c459667 100644
--- a/tests/svncom03.at
+++ b/tests/svncom03.at
@@ -1,5 +1,5 @@
 # This file is part of Vcsync testsuite. -*- Autotest -*-
-# Copyright (C) 2014 Sergey Poznyakoff
+# Copyright (C) 2014,2019 Sergey Poznyakoff
 #
 # Vcsync is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -19,7 +19,6 @@ AT_KEYWORDS([svn svncom svncom03 checkoutrc checkoutrc05])
 
 AT_CHECK([
 AT_VCS_PREREQ(SVN)
-AT_VCS_PREREQ(CVS)
 cwd=$(pwd)
 SVN_COM_INIT
 cd test
diff --git a/tests/svncom04.at b/tests/svncom04.at
index a875c38..a86cd95 100644
--- a/tests/svncom04.at
+++ b/tests/svncom04.at
@@ -18,7 +18,7 @@ AT_SETUP([add subdir .checkoutrc])
 AT_KEYWORDS([svn svncom svncom04 checkoutrc checkoutrc06])
 
 AT_CHECK([
-AT_VCS_PREREQ(CVS)
+AT_VCS_PREREQ(SVN)
 cwd=$(pwd)
 SVN_COM_INIT
 cd test
diff --git a/tests/testsuite.at b/tests/testsuite.at
index daf7278..98cc40d 100644
--- a/tests/testsuite.at
+++ b/tests/testsuite.at
@@ -1,5 +1,5 @@
 # This file is part of Vcsync testsuite. -*- Autotest -*-
-# Copyright (C) 2014 Sergey Poznyakoff
+# Copyright (C) 2014,2019 Sergey Poznyakoff
 #
 # Vcsync is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -20,8 +20,11 @@ m4_define([AT_SKIP_TEST],[exit 77])
 
 m4_define([AT_VCS_PREREQ],[
 test $[]$1[_BIN] = false && AT_SKIP_TEST
+m4_if([$1],[CVS],[AT_NONROOT_PREREQ])
 ])
 
+m4_define([AT_NONROOT_PREREQ],[test -w / && AT_SKIP_TEST])
+
 dnl CVS_REPO_INIT(DIR, CONF [, NAME])
 m4_define([CVS_REPO_INIT],[
 $CVS_BIN -d $1 init