From 7f396ca714374c7111f13677addafb831ed6d544 Mon Sep 17 00:00:00 2001
From: pooka <pooka@NetBSD.org>
Date: Tue, 6 Jul 2010 14:06:21 +0000
Subject: [PATCH] Move tests psshfs from fs/puffs to fs/psshfs.  The former is
 going to be populated by tests which actually test puffs soon.

jmmv ok
---
 tests/fs/Makefile                           | 4 ++--
 tests/fs/psshfs/Atffile                     | 6 ++++++
 tests/fs/{puffs => psshfs}/Makefile         | 2 +-
 tests/fs/{puffs => psshfs}/h_have_puffs.c   | 2 +-
 tests/fs/{puffs => psshfs}/ssh_config.in    | 2 +-
 tests/fs/{puffs => psshfs}/ssh_host_key     | 0
 tests/fs/{puffs => psshfs}/ssh_host_key.pub | 0
 tests/fs/{puffs => psshfs}/sshd_config.in   | 2 +-
 tests/fs/{puffs => psshfs}/t_psshfs.sh      | 2 +-
 9 files changed, 13 insertions(+), 7 deletions(-)
 create mode 100644 tests/fs/psshfs/Atffile
 rename tests/fs/{puffs => psshfs}/Makefile (84%)
 rename tests/fs/{puffs => psshfs}/h_have_puffs.c (96%)
 rename tests/fs/{puffs => psshfs}/ssh_config.in (82%)
 rename tests/fs/{puffs => psshfs}/ssh_host_key (100%)
 rename tests/fs/{puffs => psshfs}/ssh_host_key.pub (100%)
 rename tests/fs/{puffs => psshfs}/sshd_config.in (94%)
 rename tests/fs/{puffs => psshfs}/t_psshfs.sh (99%)

diff --git a/tests/fs/Makefile b/tests/fs/Makefile
index df1fa41953c7..9382273861b6 100644
--- a/tests/fs/Makefile
+++ b/tests/fs/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.12 2010/07/05 12:53:58 njoly Exp $
+# $NetBSD: Makefile,v 1.13 2010/07/06 14:06:21 pooka Exp $
 
 .include <bsd.own.mk>
 
 TESTSDIR=	${TESTSBASE}/fs
 
-SUBDIR+=	ffs kernfs lfs msdosfs nullfs ptyfs puffs tmpfs umapfs union
+SUBDIR+=	ffs kernfs lfs msdosfs nullfs psshfs ptyfs tmpfs umapfs union
 SUBDIR+=	vfs
 
 FILES= h_funcs.subr
diff --git a/tests/fs/psshfs/Atffile b/tests/fs/psshfs/Atffile
new file mode 100644
index 000000000000..2cdb11df440e
--- /dev/null
+++ b/tests/fs/psshfs/Atffile
@@ -0,0 +1,6 @@
+Content-Type: application/X-atf-atffile; version="1"
+X-NetBSD-Id: "$NetBSD: Atffile,v 1.1 2010/07/06 14:06:22 pooka Exp $"
+
+prop: test-suite = "NetBSD"
+
+tp-glob: t_*
diff --git a/tests/fs/puffs/Makefile b/tests/fs/psshfs/Makefile
similarity index 84%
rename from tests/fs/puffs/Makefile
rename to tests/fs/psshfs/Makefile
index f0e77d7dbb23..071c2bff6510 100644
--- a/tests/fs/puffs/Makefile
+++ b/tests/fs/psshfs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2007/12/26 22:33:54 jmmv Exp $
+# $NetBSD: Makefile,v 1.1 2010/07/06 14:06:22 pooka Exp $
 
 TESTSDIR=	${TESTSBASE}/fs/puffs
 
diff --git a/tests/fs/puffs/h_have_puffs.c b/tests/fs/psshfs/h_have_puffs.c
similarity index 96%
rename from tests/fs/puffs/h_have_puffs.c
rename to tests/fs/psshfs/h_have_puffs.c
index 9544fcafacf6..9d349508ca97 100644
--- a/tests/fs/puffs/h_have_puffs.c
+++ b/tests/fs/psshfs/h_have_puffs.c
@@ -1,4 +1,4 @@
-/* $NetBSD: h_have_puffs.c,v 1.2 2008/04/28 20:24:12 martin Exp $ */
+/* $NetBSD: h_have_puffs.c,v 1.1 2010/07/06 14:06:22 pooka Exp $ */
 /*
  * Copyright (c) 2007 The NetBSD Foundation, Inc.
  * All rights reserved.
diff --git a/tests/fs/puffs/ssh_config.in b/tests/fs/psshfs/ssh_config.in
similarity index 82%
rename from tests/fs/puffs/ssh_config.in
rename to tests/fs/psshfs/ssh_config.in
index 2becff1663a3..3ebd68b3fdac 100644
--- a/tests/fs/puffs/ssh_config.in
+++ b/tests/fs/psshfs/ssh_config.in
@@ -1,4 +1,4 @@
-# $NetBSD: ssh_config.in,v 1.1 2007/12/26 20:50:07 jmmv Exp $
+# $NetBSD: ssh_config.in,v 1.1 2010/07/06 14:06:22 pooka Exp $
 
 # Basic settings.
 Port 10000
diff --git a/tests/fs/puffs/ssh_host_key b/tests/fs/psshfs/ssh_host_key
similarity index 100%
rename from tests/fs/puffs/ssh_host_key
rename to tests/fs/psshfs/ssh_host_key
diff --git a/tests/fs/puffs/ssh_host_key.pub b/tests/fs/psshfs/ssh_host_key.pub
similarity index 100%
rename from tests/fs/puffs/ssh_host_key.pub
rename to tests/fs/psshfs/ssh_host_key.pub
diff --git a/tests/fs/puffs/sshd_config.in b/tests/fs/psshfs/sshd_config.in
similarity index 94%
rename from tests/fs/puffs/sshd_config.in
rename to tests/fs/psshfs/sshd_config.in
index 1222eec5534d..b186ea7fe797 100644
--- a/tests/fs/puffs/sshd_config.in
+++ b/tests/fs/psshfs/sshd_config.in
@@ -1,4 +1,4 @@
-# $NetBSD: sshd_config.in,v 1.3 2007/12/29 23:07:17 jmmv Exp $
+# $NetBSD: sshd_config.in,v 1.1 2010/07/06 14:06:22 pooka Exp $
 
 # Basic settings.
 Port 10000
diff --git a/tests/fs/puffs/t_psshfs.sh b/tests/fs/psshfs/t_psshfs.sh
similarity index 99%
rename from tests/fs/puffs/t_psshfs.sh
rename to tests/fs/psshfs/t_psshfs.sh
index 679119fb3094..2d035d26f3ec 100644
--- a/tests/fs/puffs/t_psshfs.sh
+++ b/tests/fs/psshfs/t_psshfs.sh
@@ -1,4 +1,4 @@
-# $NetBSD: t_psshfs.sh,v 1.7 2010/07/05 16:27:08 jmmv Exp $
+# $NetBSD: t_psshfs.sh,v 1.1 2010/07/06 14:06:22 pooka Exp $
 #
 # Copyright (c) 2007, 2008 The NetBSD Foundation, Inc.
 # All rights reserved.