From 2122247acae6672e2dcfba095dc84cf84bc8ef41 Mon Sep 17 00:00:00 2001
From: Eric Blake <ebb9@byu.net>
Date: Fri, 23 Oct 2009 08:12:29 -0600
Subject: maint: move chroot test

* tests/chroot/credentials: Move...
* tests/misc/chroot-credentials: ...here, to reduce number of
directories.
* tests/Makefile.am (root_tests): Reflect rename.
---
 tests/Makefile.am             |  2 +-
 tests/chroot/credentials      | 52 -------------------------------------------
 tests/misc/chroot-credentials | 52 +++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 53 insertions(+), 53 deletions(-)
 delete mode 100755 tests/chroot/credentials
 create mode 100755 tests/misc/chroot-credentials

(limited to 'tests')

diff --git a/tests/Makefile.am b/tests/Makefile.am
index ae17e9fe2..be92fbaea 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -24,12 +24,12 @@ root_tests =					\
   cp/preserve-gid				\
   cp/special-bits				\
   cp/cp-mv-enotsup-xattr			\
-  chroot/credentials				\
   dd/skip-seek-past-dev				\
   install/install-C-root			\
   ls/capability					\
   ls/nameless-uid				\
   misc/chcon					\
+  misc/chroot-credentials			\
   misc/selinux					\
   misc/truncate-owned-by-other			\
   mkdir/writable-under-readonly			\
diff --git a/tests/chroot/credentials b/tests/chroot/credentials
deleted file mode 100755
index f200f14ab..000000000
--- a/tests/chroot/credentials
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/sh
-# Verify that the credentials are changed correctly.
-
-# Copyright (C) 2009 Free Software Foundation, Inc.
-
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-
-if test "$VERBOSE" = yes; then
-  set -x
-  chroot --version
-fi
-
-. $srcdir/test-lib.sh
-
-require_root_
-
-fail=0
-
-# Verify that root credentials are kept.
-test $(chroot / whoami) = root || fail=1
-test "$(groups)" = "$(chroot / groups)" || fail=1
-
-# Verify that credentials are changed correctly.
-test "$(chroot --userspec=$NON_ROOT_USERNAME:$NON_ROOT_GROUP / whoami)" != root \
-    || fail=1
-
-# Verify that there are no additional groups.
-test "$(chroot --userspec=$NON_ROOT_USERNAME:$NON_ROOT_GROUP --groups=$NON_ROOT_GROUP / id -G)"\
-    = $NON_ROOT_GROUP || fail=1
-
-# Verify that when specifying only the user name we get the current
-# primary group ID.
-test "$(chroot --userspec=$NON_ROOT_USERNAME / id -g)" = "$(id -g)" \
-    || fail=1
-
-# Verify that when specifying only a group we get the current user ID
-test "$(chroot --userspec=:$NON_ROOT_GROUP / id -u)" = "$(id -u)" \
-    || fail=1
-
-Exit $fail
diff --git a/tests/misc/chroot-credentials b/tests/misc/chroot-credentials
new file mode 100755
index 000000000..f200f14ab
--- /dev/null
+++ b/tests/misc/chroot-credentials
@@ -0,0 +1,52 @@
+#!/bin/sh
+# Verify that the credentials are changed correctly.
+
+# Copyright (C) 2009 Free Software Foundation, Inc.
+
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+
+if test "$VERBOSE" = yes; then
+  set -x
+  chroot --version
+fi
+
+. $srcdir/test-lib.sh
+
+require_root_
+
+fail=0
+
+# Verify that root credentials are kept.
+test $(chroot / whoami) = root || fail=1
+test "$(groups)" = "$(chroot / groups)" || fail=1
+
+# Verify that credentials are changed correctly.
+test "$(chroot --userspec=$NON_ROOT_USERNAME:$NON_ROOT_GROUP / whoami)" != root \
+    || fail=1
+
+# Verify that there are no additional groups.
+test "$(chroot --userspec=$NON_ROOT_USERNAME:$NON_ROOT_GROUP --groups=$NON_ROOT_GROUP / id -G)"\
+    = $NON_ROOT_GROUP || fail=1
+
+# Verify that when specifying only the user name we get the current
+# primary group ID.
+test "$(chroot --userspec=$NON_ROOT_USERNAME / id -g)" = "$(id -g)" \
+    || fail=1
+
+# Verify that when specifying only a group we get the current user ID
+test "$(chroot --userspec=:$NON_ROOT_GROUP / id -u)" = "$(id -u)" \
+    || fail=1
+
+Exit $fail
-- 
cgit v1.2.3-54-g00ecf