1. Remove the change_owner.c and change_owner.mode.sh. 2. Clean up the referencies from runtest files and .gitignore. 3. Fix chmod06 without -D option in ltplite and stress.part3.
Signed-off-by: Zeng Linggang <[email protected]> --- runtest/ltplite | 16 ++-- runtest/stress.part3 | 16 ++-- testcases/kernel/syscalls/.gitignore | 5 -- testcases/kernel/syscalls/chmod/change_owner.c | 96 ---------------------- .../kernel/syscalls/chmod/change_owner.mode.sh | 16 ---- testcases/kernel/syscalls/chmod/chmod05.c | 6 +- testcases/kernel/syscalls/chown/Makefile | 4 - testcases/kernel/syscalls/chown/change_owner.c | 89 -------------------- .../kernel/syscalls/chown/change_owner.mode.sh | 16 ---- testcases/kernel/syscalls/fchmod/change_owner.c | 94 --------------------- .../kernel/syscalls/fchmod/change_owner.mode.sh | 16 ---- testcases/kernel/syscalls/fchown/change_owner.c | 94 --------------------- .../kernel/syscalls/fchown/change_owner.mode.sh | 16 ---- 13 files changed, 17 insertions(+), 467 deletions(-) delete mode 100644 testcases/kernel/syscalls/chmod/change_owner.c delete mode 100644 testcases/kernel/syscalls/chmod/change_owner.mode.sh delete mode 100644 testcases/kernel/syscalls/chown/change_owner.c delete mode 100644 testcases/kernel/syscalls/chown/change_owner.mode.sh delete mode 100644 testcases/kernel/syscalls/fchmod/change_owner.c delete mode 100644 testcases/kernel/syscalls/fchmod/change_owner.mode.sh delete mode 100644 testcases/kernel/syscalls/fchown/change_owner.c delete mode 100644 testcases/kernel/syscalls/fchown/change_owner.mode.sh diff --git a/runtest/ltplite b/runtest/ltplite index 2f8f977..9542b30 100644 --- a/runtest/ltplite +++ b/runtest/ltplite @@ -104,14 +104,14 @@ chmod01A symlink01 -T chmod01 chmod02 chmod02 chmod03 chmod03 chmod04 chmod04 -chmod05 cp -p $LTPROOT/testcases/bin/change_owner $TMPDIR;chmod05 -chmod06 cp -p $LTPROOT/testcases/bin/change_owner $TMPDIR;chmod06 +chmod05 chmod05 +chmod06 chmod06 -D $LTP_DEV -T $LTP_DEV_FS_TYPE chmod07 chmod07 chown01 chown01 chown02 chown02 -chown03 export change_owner=$LTPROOT/testcases/bin/change_owner;chown03 -chown04 cp -p $LTPROOT/testcases/bin/change_owner $TMPDIR;chown04 -D $LTP_DEV -T $LTP_DEV_FS_TYPE +chown03 chown03 +chown04 chown04 -D $LTP_DEV -T $LTP_DEV_FS_TYPE chown05 chown05 chroot01 chroot01 @@ -183,14 +183,14 @@ fchmod01 fchmod01 fchmod02 fchmod02 fchmod03 fchmod03 fchmod04 fchmod04 -fchmod05 cp -p $LTPROOT/testcases/bin/change_owner $TMPDIR;fchmod05 -fchmod06 cp -p $LTPROOT/testcases/bin/change_owner $TMPDIR;fchmod06 -D $LTP_DEV -T $LTP_DEV_FS_TYPE +fchmod05 fchmod05 +fchmod06 fchmod06 -D $LTP_DEV -T $LTP_DEV_FS_TYPE fchmod07 fchmod07 fchown01 fchown01 fchown02 fchown02 -fchown03 cp -p $LTPROOT/testcases/bin/change_owner $TMPDIR;fchown03 -fchown04 export change_owner=$LTPROOT/testcases/bin/change_owner;fchown04 +fchown03 fchown03 +fchown04 fchown04 fchown05 fchown05 fcntl01 fcntl01 diff --git a/runtest/stress.part3 b/runtest/stress.part3 index 5703d13..e78d1f3 100644 --- a/runtest/stress.part3 +++ b/runtest/stress.part3 @@ -46,14 +46,14 @@ chmod01A symlink01 -T chmod01 chmod02 chmod02 chmod03 chmod03 chmod04 chmod04 -chmod05 cp -p $LTPROOT/testcases/bin/change_owner $TMPDIR;chmod05 -chmod06 cp -p $LTPROOT/testcases/bin/change_owner $TMPDIR;chmod06 +chmod05 chmod05 +chmod06 chmod06 -D $LTP_DEV -T $LTP_DEV_FS_TYPE chmod07 chmod07 chown01 chown01 chown02 chown02 -chown03 export change_owner=$LTPROOT/testcases/bin/change_owner;chown03 -chown04 cp -p $LTPROOT/testcases/bin/change_owner $TMPDIR;chown04 -D $LTP_DEV -T $LTP_DEV_FS_TYPE +chown03 chown03 +chown04 chown04 -D $LTP_DEV -T $LTP_DEV_FS_TYPE chown05 chown05 chroot01 chroot01 @@ -124,14 +124,14 @@ fchmod01 fchmod01 fchmod02 fchmod02 fchmod03 fchmod03 fchmod04 fchmod04 -fchmod05 cp -p $LTPROOT/testcases/bin/change_owner $TMPDIR;fchmod05 -fchmod06 cp -p $LTPROOT/testcases/bin/change_owner $TMPDIR;fchmod06 -D $LTP_DEV -T $LTP_DEV_FS_TYPE +fchmod05 fchmod05 +fchmod06 fchmod06 -D $LTP_DEV -T $LTP_DEV_FS_TYPE fchmod07 fchmod07 fchown01 fchown01 fchown02 fchown02 -fchown03 cp -p $LTPROOT/testcases/bin/change_owner $TMPDIR;fchown03 -fchown04 export change_owner=$LTPROOT/testcases/bin/change_owner;fchown04 +fchown03 fchown03 +fchown04 fchown04 fchown05 fchown05 fcntl01 fcntl01 diff --git a/testcases/kernel/syscalls/.gitignore b/testcases/kernel/syscalls/.gitignore index b622244..ca7a5e5 100644 --- a/testcases/kernel/syscalls/.gitignore +++ b/testcases/kernel/syscalls/.gitignore @@ -32,7 +32,6 @@ /chdir/chdir02 /chdir/chdir03 /chdir/chdir04 -/chmod/change_owner /chmod/chmod01 /chmod/chmod02 /chmod/chmod03 @@ -40,7 +39,6 @@ /chmod/chmod05 /chmod/chmod06 /chmod/chmod07 -/chown/change_owner /chown/chown01 /chown/chown01_16 /chown/chown02 @@ -134,7 +132,6 @@ /fchdir/fchdir01 /fchdir/fchdir02 /fchdir/fchdir03 -/fchmod/change_owner /fchmod/fchmod01 /fchmod/fchmod02 /fchmod/fchmod03 @@ -143,8 +140,6 @@ /fchmod/fchmod06 /fchmod/fchmod07 /fchmodat/fchmodat01 -/fchown/change_owner -/fchown/change_owner_16 /fchown/fchown01 /fchown/fchown01_16 /fchown/fchown02 diff --git a/testcases/kernel/syscalls/chmod/change_owner.c b/testcases/kernel/syscalls/chmod/change_owner.c deleted file mode 100644 index 22c4d61..0000000 --- a/testcases/kernel/syscalls/chmod/change_owner.c +++ /dev/null @@ -1,96 +0,0 @@ -/* - * - * Copyright (c) International Business Machines Corp., 2001 - * - * 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 2 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, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -/* - * Description: This is a setuid to root program invoked by a non-root - * process to change the user id/group id bits on the test - * directory/file created in the setup function. - * - * This function exit with 0 or 1 depending upon the - * success/failure of chown(2) system call. - */ - -#include <sys/types.h> -#include <errno.h> -#include <grp.h> -#include <pwd.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <unistd.h> - -int main(int argc, char **argv) -{ - struct passwd *ltpuser; /* password struct for ltpuser2 */ - struct group *ltpgroup; /* group struct for ltpuser2 */ - uid_t user_uid; /* user id of ltpuser2 */ - gid_t group_gid; /* group id of ltpuser2 */ - char *test_name; /* test specific name */ - char *path_name; /* name of test directory/file */ - - if (argc != 3) { - fprintf(stderr, - "This is a helper binary meant for internal LTP usage " - "only\n"); - exit(1); - } - - test_name = argv[1]; - path_name = argv[2]; - - /* - * Get the user id and group id of "ltpuser2" user from password - * and group files. - */ - if ((ltpuser = getpwnam("nobody")) == NULL) { - perror("change_owner: nobody not found in /etc/passwd"); - exit(1); - } - if ((ltpgroup = getgrnam("nobody")) == NULL) { - if ((ltpgroup = getgrnam("nogroup")) == NULL) { - perror - ("change_owner: nobody/nogroup's group not found in /etc/group"); - exit(1); - } - } - - user_uid = 0; - group_gid = 0; - - /* Check for test specific name and set uid/gid accordingly */ - if (!(strcmp(test_name, "fchown03"))) { - user_uid = -1; - group_gid = ltpgroup->gr_gid; - } else if (!(strcmp(test_name, "fchown04"))) { - user_uid = ltpuser->pw_uid; - group_gid = ltpgroup->gr_gid; - } - - /* - * Change the ownership of test directory/file specified by - * pathname to that of user_uid and group_gid. - */ - if (chown(path_name, user_uid, group_gid) < 0) { - fprintf(stderr, "change_owner: chown() of %s failed, error " - "%d\n", path_name, errno); - exit(1); - } - - exit(0); -} diff --git a/testcases/kernel/syscalls/chmod/change_owner.mode.sh b/testcases/kernel/syscalls/chmod/change_owner.mode.sh deleted file mode 100644 index 05f1240..0000000 --- a/testcases/kernel/syscalls/chmod/change_owner.mode.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh - -failed() { - echo "" - echo " ************** WARNING **************" - echo " Cannot change permission or ownership of \"change_owner\"." - echo " Tests in this directory will fail"$ - echo " Run "make install" as root." - echo " *************************************" - sleep 2 -} - -chown root change_owner || failed -chmod 04755 change_owner || failed - -exit 0 diff --git a/testcases/kernel/syscalls/chmod/chmod05.c b/testcases/kernel/syscalls/chmod/chmod05.c index 93aeec4..9bb5e8f 100644 --- a/testcases/kernel/syscalls/chmod/chmod05.c +++ b/testcases/kernel/syscalls/chmod/chmod05.c @@ -76,11 +76,7 @@ * -Robbie Williamson * * RESTRICTIONS: -//wjh -//Actually it seems that this test has to be run by root (check setup()) and -//it calls another program (change_owner) to change ownership on the directory -//it creates. But this test never gives up it's uid/gid to be nonroot - * This test should be run by 'non-super-user' only. + * This test should be run by root. * */ diff --git a/testcases/kernel/syscalls/chown/Makefile b/testcases/kernel/syscalls/chown/Makefile index 1260f44..6c8544a 100644 --- a/testcases/kernel/syscalls/chown/Makefile +++ b/testcases/kernel/syscalls/chown/Makefile @@ -20,10 +20,6 @@ top_srcdir ?= ../../../.. include $(top_srcdir)/include/mk/testcases.mk -SRCS := $(filter-out %/change_owner.c,$(wildcard $(abs_srcdir)/*.c)) - include $(abs_srcdir)/../utils/compat_16.mk -MAKE_TARGETS += change_owner - include $(top_srcdir)/include/mk/generic_leaf_target.mk diff --git a/testcases/kernel/syscalls/chown/change_owner.c b/testcases/kernel/syscalls/chown/change_owner.c deleted file mode 100644 index 7607e9b..0000000 --- a/testcases/kernel/syscalls/chown/change_owner.c +++ /dev/null @@ -1,89 +0,0 @@ -/* - * - * Copyright (c) International Business Machines Corp., 2001 - * - * 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 2 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, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -/* - * Description: This is a setuid to root program invoked by a non-root - * process to change the user id/group id bits on the test - * directory/file created in the setup function. - * - * This function exit with 0 or 1 depending upon the - * success/failure of chown(2) system call. - */ -#include <stdio.h> -#include <unistd.h> -#include <stdlib.h> -#include <string.h> -#include <sys/types.h> -#include <pwd.h> -#include <grp.h> -#include <errno.h> - -int main(int argc, char **argv) -{ - struct passwd *ltpuser; /* password struct for ltpuser2 */ - struct group *ltpgroup; /* group struct for ltpuser2 */ - uid_t user_uid; /* user id of ltpuser2 */ - gid_t group_gid; /* group id of ltpuser2 */ - char *test_name; /* test specific name */ - char *path_name; /* name of test directory/file */ - - if (argc != 3) { - fprintf(stderr, - "This is a helper binary meant for internal LTP usage only\n"); - exit(1); - } - - test_name = argv[1]; - path_name = argv[2]; - - if ((ltpuser = getpwnam("nobody")) == NULL) { - perror("getpwnam(\"nobody\") failed"); - exit(1); - } - if ((ltpgroup = getgrnam("nobody")) == NULL) { - if ((ltpgroup = getgrnam("nogroup")) == NULL) { - perror("getgrnam(\"nobody\") failed"); - exit(1); - } - } - - user_uid = 0; - group_gid = 0; - - /* Check for test specific name and set uid/gid accordingly */ - if (strcmp(test_name, "fchown03") == 0) { - user_uid = -1; - group_gid = ltpgroup->gr_gid; - } else if (strcmp(test_name, "fchown04") == 0) { - user_uid = ltpuser->pw_uid; - group_gid = ltpgroup->gr_gid; - } - - /* - * Change the ownership of test directory/file specified by - * pathname to that of user_uid and group_gid. - */ - if (chown(path_name, user_uid, group_gid) == -1) { - fprintf(stderr, "chown(%s, ..) failed: %s", - path_name, strerror(errno)); - exit(1); - } - - exit(0); -} diff --git a/testcases/kernel/syscalls/chown/change_owner.mode.sh b/testcases/kernel/syscalls/chown/change_owner.mode.sh deleted file mode 100644 index 05f1240..0000000 --- a/testcases/kernel/syscalls/chown/change_owner.mode.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh - -failed() { - echo "" - echo " ************** WARNING **************" - echo " Cannot change permission or ownership of \"change_owner\"." - echo " Tests in this directory will fail"$ - echo " Run "make install" as root." - echo " *************************************" - sleep 2 -} - -chown root change_owner || failed -chmod 04755 change_owner || failed - -exit 0 diff --git a/testcases/kernel/syscalls/fchmod/change_owner.c b/testcases/kernel/syscalls/fchmod/change_owner.c deleted file mode 100644 index 55e7cbe..0000000 --- a/testcases/kernel/syscalls/fchmod/change_owner.c +++ /dev/null @@ -1,94 +0,0 @@ -/* - * - * Copyright (c) International Business Machines Corp., 2001 - * - * 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 2 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, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -/* - * Description: This is a setuid to root program invoked by a non-root - * process to change the user id/group id bits on the test - * directory/file created in the setup function. - * - * This function exit with 0 or 1 depending upon the - * success/failure of chown(2) system call. - */ -#include <stdio.h> -#include <unistd.h> -#include <sys/types.h> -#include <pwd.h> -#include <grp.h> -#include <errno.h> -#include <stdlib.h> -#include <string.h> - -int main(int argc, char **argv) -{ - struct passwd *ltpuser; /* password struct for ltpuser2 */ - struct group *ltpgroup; /* group struct for ltpuser2 */ - uid_t user_uid; /* user id of ltpuser2 */ - gid_t group_gid; /* group id of ltpuser2 */ - char *test_name; /* test specific name */ - char *path_name; /* name of test directory/file */ - - if (argc != 3) { - fprintf(stderr, - "This is a helper binary meant for internal LTP usage only\n"); - exit(1); - } - - test_name = argv[1]; - path_name = argv[2]; - - /* - * Get the user id and group id of "ltpuser2" user from password - * and group files. - */ - if ((ltpuser = getpwnam("nobody")) == NULL) { - perror("change_owner: nobody not found in /etc/passwd"); - exit(1); - } - if ((ltpgroup = getgrnam("nobody")) == NULL) { - if ((ltpgroup = getgrnam("nogroup")) == NULL) { - perror - ("change_owner: nobody/nogroup's group not found in /etc/group"); - exit(1); - } - } - - user_uid = 0; - group_gid = 0; - - /* Check for test specific name and set uid/gid accordingly */ - if (!(strcmp(test_name, "fchown03"))) { - user_uid = -1; - group_gid = ltpgroup->gr_gid; - } else if (!(strcmp(test_name, "fchown04"))) { - user_uid = ltpuser->pw_uid; - group_gid = ltpgroup->gr_gid; - } - - /* - * Change the ownership of test directory/file specified by - * pathname to that of user_uid and group_gid. - */ - if (chown(path_name, user_uid, group_gid) < 0) { - fprintf(stderr, "change_owner: chown() of %s failed, error " - "%d\n", path_name, errno); - exit(1); - } - - exit(0); -} diff --git a/testcases/kernel/syscalls/fchmod/change_owner.mode.sh b/testcases/kernel/syscalls/fchmod/change_owner.mode.sh deleted file mode 100644 index 05f1240..0000000 --- a/testcases/kernel/syscalls/fchmod/change_owner.mode.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh - -failed() { - echo "" - echo " ************** WARNING **************" - echo " Cannot change permission or ownership of \"change_owner\"." - echo " Tests in this directory will fail"$ - echo " Run "make install" as root." - echo " *************************************" - sleep 2 -} - -chown root change_owner || failed -chmod 04755 change_owner || failed - -exit 0 diff --git a/testcases/kernel/syscalls/fchown/change_owner.c b/testcases/kernel/syscalls/fchown/change_owner.c deleted file mode 100644 index 55e7cbe..0000000 --- a/testcases/kernel/syscalls/fchown/change_owner.c +++ /dev/null @@ -1,94 +0,0 @@ -/* - * - * Copyright (c) International Business Machines Corp., 2001 - * - * 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 2 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, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -/* - * Description: This is a setuid to root program invoked by a non-root - * process to change the user id/group id bits on the test - * directory/file created in the setup function. - * - * This function exit with 0 or 1 depending upon the - * success/failure of chown(2) system call. - */ -#include <stdio.h> -#include <unistd.h> -#include <sys/types.h> -#include <pwd.h> -#include <grp.h> -#include <errno.h> -#include <stdlib.h> -#include <string.h> - -int main(int argc, char **argv) -{ - struct passwd *ltpuser; /* password struct for ltpuser2 */ - struct group *ltpgroup; /* group struct for ltpuser2 */ - uid_t user_uid; /* user id of ltpuser2 */ - gid_t group_gid; /* group id of ltpuser2 */ - char *test_name; /* test specific name */ - char *path_name; /* name of test directory/file */ - - if (argc != 3) { - fprintf(stderr, - "This is a helper binary meant for internal LTP usage only\n"); - exit(1); - } - - test_name = argv[1]; - path_name = argv[2]; - - /* - * Get the user id and group id of "ltpuser2" user from password - * and group files. - */ - if ((ltpuser = getpwnam("nobody")) == NULL) { - perror("change_owner: nobody not found in /etc/passwd"); - exit(1); - } - if ((ltpgroup = getgrnam("nobody")) == NULL) { - if ((ltpgroup = getgrnam("nogroup")) == NULL) { - perror - ("change_owner: nobody/nogroup's group not found in /etc/group"); - exit(1); - } - } - - user_uid = 0; - group_gid = 0; - - /* Check for test specific name and set uid/gid accordingly */ - if (!(strcmp(test_name, "fchown03"))) { - user_uid = -1; - group_gid = ltpgroup->gr_gid; - } else if (!(strcmp(test_name, "fchown04"))) { - user_uid = ltpuser->pw_uid; - group_gid = ltpgroup->gr_gid; - } - - /* - * Change the ownership of test directory/file specified by - * pathname to that of user_uid and group_gid. - */ - if (chown(path_name, user_uid, group_gid) < 0) { - fprintf(stderr, "change_owner: chown() of %s failed, error " - "%d\n", path_name, errno); - exit(1); - } - - exit(0); -} diff --git a/testcases/kernel/syscalls/fchown/change_owner.mode.sh b/testcases/kernel/syscalls/fchown/change_owner.mode.sh deleted file mode 100644 index 05f1240..0000000 --- a/testcases/kernel/syscalls/fchown/change_owner.mode.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh - -failed() { - echo "" - echo " ************** WARNING **************" - echo " Cannot change permission or ownership of \"change_owner\"." - echo " Tests in this directory will fail"$ - echo " Run "make install" as root." - echo " *************************************" - sleep 2 -} - -chown root change_owner || failed -chmod 04755 change_owner || failed - -exit 0 -- 1.8.4.2 ------------------------------------------------------------------------------ Managing the Performance of Cloud-Based Applications Take advantage of what the Cloud has to offer - Avoid Common Pitfalls. Read the Whitepaper. http://pubads.g.doubleclick.net/gampad/clk?id=121054471&iu=/4140/ostg.clktrk _______________________________________________ Ltp-list mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/ltp-list
