The import test of regress/usr.bin/cvs tries to touch a file in

src, not in obj.  So better populate an import directory in obj and
import from there.  Also remove trailing whitespaces and semicolons.
OK otto@

4 files changed, 14 insertions, 12 deletions

diff --git a/regress/usr.bin/cvs/Makefile b/regress/usr.bin/cvs/Makefile
index 97a02b28b36..cbfe6cbcbeb 100644
--- a/regress/usr.bin/cvs/Makefile
+++ b/regress/usr.bin/cvs/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.30 2016/09/30 14:33:10 bluhm Exp $
+#	$OpenBSD: Makefile,v 1.31 2016/09/30 22:11:37 bluhm Exp $
 
 # Regression tests by Niall O'Higgins <niallo@openbsd.org> and
 # Tobias Stoeckmann <tobias@openbsd.org>.
@@ -13,6 +13,7 @@ CVSCMD=		${CVS} -f
 REGRESS_ROOT=	${.OBJDIR}/regress_cvs_root
 REGRESS_WCOPY=	${.OBJDIR}/regress_cvs_wcopy
 REGRESS_SEED=	${REGRESS_WCOPY}/seed
+REGRESS_IMPORT=	${.OBJDIR}/regress_cvs_import
 
 .if defined(REMOTE)
 MYCVSROOT?=	localhost:${REGRESS_ROOT}
@@ -29,7 +30,7 @@ MYCVSROOT?=	${REGRESS_ROOT}
 DIFF=		diff -u
 
 CLEANFILES=	regress_cvs_root regress_cvs_wcopy regress_cvs_stderr \
-		regress_cvs_stdout
+		regress_cvs_stdout regress_cvs_import
 
 # These must be done in order.
 LTESTS= cvs-initial \
@@ -139,7 +140,7 @@ test-cvs-checkout-kflag-kv-rflag-1.1:
 	@mkdir ${REGRESS_WCOPY}
 	@cd ${REGRESS_WCOPY}; \
 	    ${CVSCMD} -Q -d ${MYCVSROOT} co -r 1.1 -kkv seed > /dev/null
-	@test -f ${REGRESS_SEED}/seed1.txt;
+	@test -f ${REGRESS_SEED}/seed1.txt
 	@eval 'test `grep -c -e T1.1 -e -kkv \
 	    ${REGRESS_SEED}/CVS/Entries | wc -l` -eq 1'
 
@@ -172,7 +173,7 @@ test-cvs-checkout-rflag-HEAD:
 	@mkdir ${REGRESS_WCOPY}
 	@cd ${REGRESS_WCOPY}; \
 	    ${CVSCMD} -Q -d ${MYCVSROOT} co -rHEAD seed > /dev/null
-	@test -f ${REGRESS_SEED}/seed1.txt;
+	@test -f ${REGRESS_SEED}/seed1.txt
 	@eval 'test `grep -c THEAD ${REGRESS_SEED}/CVS/Entries | wc -l` -eq 1'
 
 test-cvs-checkout-rflag-1.1:
@@ -233,9 +234,11 @@ test-cvs-export:
 	@test -f ${REGRESS_SEED}/seed1.txt
 
 test-cvs-import-mflag:
-	@cd ${.CURDIR}/import_seed; \
-	    touch -t 200001010100 seed1.txt; \
-	    ${CVSCMD} -Q -d ${MYCVSROOT} import \
+	@rm -rf ${REGRESS_IMPORT}
+	@mkdir ${REGRESS_IMPORT}
+	@cp ${.CURDIR}/seed1.txt ${REGRESS_IMPORT}
+	@touch -t 200001010100 ${REGRESS_IMPORT}/seed1.txt
+	@cd ${REGRESS_IMPORT} && ${CVSCMD} -Q -d ${MYCVSROOT} import \
 	    -m'import seed repo' seed regress regress_import > /dev/null
 	@chmod u+w ${REGRESS_ROOT}/seed/seed1.txt,v
 	@perl ${.CURDIR}/setdate.pl ${REGRESS_ROOT}/seed/seed1.txt,v 1.1 \
@@ -333,7 +336,7 @@ test-cvs-update-with-local:
 	@echo "new file" > ${REGRESS_WCOPY}/a/seed/test.txt
 	@cd ${REGRESS_WCOPY}/a/seed && \
 		${CVSCMD} -Q add test.txt > /dev/null && \
-		${CVSCMD} -Q com -m 'a' > /dev/null; 
+		${CVSCMD} -Q com -m 'a' > /dev/null
 	@echo "local file" > ${REGRESS_WCOPY}/b/seed/test.txt
 	@cd ${REGRESS_WCOPY}/b/seed && \
 		${CVSCMD} -Q up 2>&1|grep -q '^C test.txt' && \
diff --git a/regress/usr.bin/cvs/import_seed/seed1.txt b/regress/usr.bin/cvs/import_seed/seed1.txt
deleted file mode 100644
index 60b0e476399..00000000000
--- a/regress/usr.bin/cvs/import_seed/seed1.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-$Id: seed1.txt,v 1.1 2007/06/05 05:49:41 niallo Exp $
-a test file for the seed repository
diff --git a/regress/usr.bin/cvs/seed1.txt b/regress/usr.bin/cvs/seed1.txt
new file mode 100644
index 00000000000..766eebdbb60
--- /dev/null
+++ b/regress/usr.bin/cvs/seed1.txt
@@ -0,0 +1,2 @@
+$Id: seed1.txt,v 1.1 2016/09/30 22:11:37 bluhm Exp $
+a test file for the seed repository
diff --git a/regress/usr.bin/cvs/setdate.pl b/regress/usr.bin/cvs/setdate.pl
index a265dc2d5f1..d533c6b03f1 100644
--- a/regress/usr.bin/cvs/setdate.pl
+++ b/regress/usr.bin/cvs/setdate.pl
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# $OpenBSD: setdate.pl,v 1.1 2008/03/10 20:03:21 tobias Exp $
+# $OpenBSD: setdate.pl,v 1.2 2016/09/30 22:11:37 bluhm Exp $
 #
 # Sets "date x;" of specified revision in rcsfile to date.
 # This script is needed to make -D checks available.  CVS adjusts dates
@@ -31,4 +31,3 @@ for (@lines) {
 	print FILE "$_";
 }
 close FILE;
-