maint: move all id(1) tests to the same directory

* tests/misc/id-context.sh -> tests/id/context.sh
* tests/misc/id-setgid.sh -> tests/id/setgid.sh
* tests/misc/id-uid.sh -> tests/id/uid.sh
* tests/misc/id-zero.sh -> tests/id/zero.sh
* tests/local.mk: Reference the renamed tests

4 files changed, 0 insertions, 167 deletions

diff --git a/tests/misc/id-context.sh b/tests/misc/id-context.sh
deleted file mode 100755
index dc0230335..000000000
--- a/tests/misc/id-context.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-# Ensure that "id" outputs SELinux context only without specified user
-# Copyright (C) 2008-2013 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/>.
-
-. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
-print_ver_ id
-# Require selinux - when selinux is disabled, id never prints scontext.
-require_selinux_
-
-
-# Check without specified user, context string should be present.
-id | grep context= >/dev/null || fail=1
-
-# Check with specified user, no context string should be present.
-# But if the current user is nameless, skip this part.
-id -nu > /dev/null \
-  && id $(id -nu) | grep context= >/dev/null && fail=1
-
-Exit $fail
diff --git a/tests/misc/id-setgid.sh b/tests/misc/id-setgid.sh
deleted file mode 100755
index f29eec072..000000000
--- a/tests/misc/id-setgid.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-# Verify that id -G prints the right group when run set-GID.
-
-# Copyright (C) 2012-2013 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/>.
-
-. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
-print_ver_ id
-require_root_
-
-g=$(id -u $NON_ROOT_USERNAME) || framework_failure_
-
-# Construct a different group number.
-gp1=$(expr $g + 1)
-
-echo $gp1 > exp || framework_failure_
-
-setuidgid -g $gp1 $NON_ROOT_USERNAME env PATH="$PATH" id -G > out || fail=1
-compare exp out || fail=1
-# With coreutils-8.16 and earlier, id -G would print both: $gp1 $g
-
-Exit $fail
diff --git a/tests/misc/id-uid.sh b/tests/misc/id-uid.sh
deleted file mode 100755
index 13f5663a6..000000000
--- a/tests/misc/id-uid.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-# Ensure that "id" works with numeric user ids
-# Copyright (C) 2013 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/>.
-
-. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
-print_ver_ id
-
-uid=$(id -u) || fail=1
-user=$(id -nu) || fail=1
-
-# Ensure the empty user spec is discarded
-id '' && fail=1
-
-for mode in '' '-G' '-g'; do
-  id $mode $user > user_out || fail=1 # lookup name for comparison
-
-  id $mode $uid > uid_out || fail=1   # lookup name "$uid" before id "$uid"
-  compare user_out uid_out || fail=1
-
-  id $mode +$uid > uid_out || fail=1  # lookup only id "$uid"
-  compare user_out uid_out || fail=1
-done
-
-Exit $fail
diff --git a/tests/misc/id-zero.sh b/tests/misc/id-zero.sh
deleted file mode 100755
index 61a2c07ce..000000000
--- a/tests/misc/id-zero.sh
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/bin/sh
-# Exercise "id --zero".
-
-# Copyright (C) 2013 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/>.
-
-. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
-print_ver_ id
-
-u="$( id -nu )"
-id || fail=1
-id "$u" || fail=1
-
-# id(1) should refuse --zero in default format.
-echo 'id: option --zero not permitted in default format' > err-exp \
-  || framework_failure_
-id --zero > out 2>err && fail=1
-compare /dev/null out || fail=1
-compare err-exp   err || fail=1
-
-# Create a nice list of users.
-# Add $USER to ensure we have at least one explicit entry.
-users="$u"
-# Add a few typical users to test single group and multiple groups.
-for u in root man postfix sshd nobody ; do
-  id $u >/dev/null 2>&1 && users="$users $u"
-done
-# Add $users and '' (implicit $USER) to list to process.
-printf '%s\n' $users '' >> users || framework_failure_
-
-# Exercise "id -z" with various options.
-printf '\n' > exp || framework_failure_
-:> out || framework_failure_
-
-while read u ; do
-  for o in g gr G Gr u ur ; do
-    for n in '' n ; do
-      printf   '%s: ' "id -${o}${n}[z] $u" >> exp || framework_failure_
-      printf '\n%s: ' "id -${o}${n}[z] $u" >> out || framework_failure_
-      # There may be no name corresponding to an id, so don't check
-      # exit status when in name lookup mode
-      id -${o}${n}  $u >> exp || { test -z "$n" && fail=1; }
-      id -${o}${n}z $u  > tmp || { test -z "$n" && fail=1; }
-      head -c-1 < tmp >> out || framework_failure_
-    done
-  done
-done < users
-printf '\n' >> out || framework_failure_
-tr '\0' ' ' < out > out2 || framework_failure_
-compare exp out2 || fail=1
-
-Exit $fail