Hi,
> Except the Makefile part, others would apply fine:
>
> patching file testcases/kernel/syscalls/getuid/Makefile
> Hunk #1 FAILED at 16.
> 1 out of 1 hunk FAILED -- saving rejects to file
> testcases/kernel/syscalls/getuid/Makefile.rej
> patching file testcases/kernel/syscalls/getuid/getuid01.c
> patching file testcases/kernel/syscalls/getuid/getuid02.c
> patching file testcases/kernel/syscalls/getuid/getuid03.c
Sorry. I forgot to update my local copy.
I've just recreated the patch with newer build system.
To apply getuid-20091015.patch use -p0 option.
Put compat_uid.h at testcases/kernel/syscalls/utils/compat_uid.h.
Put compat_16.h. at testcases/kernel/syscalls/getuid/compat_16.h.
I've just modified Makefile since last submitting.
Signed-off-by: Masatake YAMATO <[email protected]>
Index: testcases/kernel/syscalls/getuid/Makefile
===================================================================
RCS file: /cvsroot/ltp/ltp/testcases/kernel/syscalls/getuid/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- testcases/kernel/syscalls/getuid/Makefile 9 Oct 2009 17:55:56 -0000 1.9
+++ testcases/kernel/syscalls/getuid/Makefile 14 Oct 2009 10:12:41 -0000
@@ -20,4 +20,7 @@
include $(top_srcdir)/include/mk/testcases.mk
include $(abs_srcdir)/../utils/compat_16.mk
+
+CPPFLAGS += -I$(abs_srcdir)/../utils
+
include $(top_srcdir)/include/mk/generic_leaf_target.mk
Index: testcases/kernel/syscalls/getuid/getuid01.c
===================================================================
RCS file: /cvsroot/ltp/ltp/testcases/kernel/syscalls/getuid/getuid01.c,v
retrieving revision 1.7
diff -u -r1.7 getuid01.c
--- testcases/kernel/syscalls/getuid/getuid01.c 23 Mar 2009 13:35:45 -0000 1.7
+++ testcases/kernel/syscalls/getuid/getuid01.c 14 Oct 2009 10:12:41 -0000
@@ -116,11 +116,12 @@
#include <signal.h>
#include "test.h"
#include "usctest.h"
+#include "compat_16.h"
void setup();
void cleanup();
-char *TCID = "getuid01"; /* Test program identifier. */
+TCID_DEFINE(getuid01); /* Test program identifier. */
int TST_TOTAL = 1; /* Total number of test cases. */
extern int Tst_count; /* Test Case counter for tst_* routines */
@@ -156,7 +157,7 @@
/*
* Call getuid(2)
*/
- TEST(getuid());
+ TEST(GETUID());
/* check return code */
if (TEST_RETURN == -1) {
Index: testcases/kernel/syscalls/getuid/getuid02.c
===================================================================
RCS file: /cvsroot/ltp/ltp/testcases/kernel/syscalls/getuid/getuid02.c,v
retrieving revision 1.4
diff -u -r1.4 getuid02.c
--- testcases/kernel/syscalls/getuid/getuid02.c 23 Mar 2009 13:35:45 -0000 1.4
+++ testcases/kernel/syscalls/getuid/getuid02.c 14 Oct 2009 10:12:41 -0000
@@ -44,8 +44,9 @@
#include <errno.h>
#include <test.h>
#include <usctest.h>
+#include "compat_16.h"
-char *TCID = "getuid02";
+TCID_DEFINE(getuid02);
int TST_TOTAL = 1;
extern int Tst_count;
@@ -71,7 +72,7 @@
/* reset Tst_count in case we are looping */
Tst_count = 0;
- TEST(geteuid());
+ TEST(GETEUID());
if (TEST_RETURN < 0) {
tst_brkm(TBROK, cleanup, "This should never happen");
@@ -83,6 +84,11 @@
if (pwent == NULL) {
tst_resm(TFAIL, "geteuid() returned unexpected "
"value %d", TEST_RETURN);
+ } else if (!UID_SIZE_CHECK(pwent->pw_uid)) {
+ tst_brkm(TBROK,
+ cleanup,
+ "uid(%d) is too large for testing geteuid16",
+ TEST_RETURN);
} else {
if (pwent->pw_uid != TEST_RETURN) {
tst_resm(TFAIL, "getpwuid() value, %d, "
Index: testcases/kernel/syscalls/getuid/getuid03.c
===================================================================
RCS file: /cvsroot/ltp/ltp/testcases/kernel/syscalls/getuid/getuid03.c,v
retrieving revision 1.6
diff -u -r1.6 getuid03.c
--- testcases/kernel/syscalls/getuid/getuid03.c 23 Mar 2009 13:35:45 -0000 1.6
+++ testcases/kernel/syscalls/getuid/getuid03.c 14 Oct 2009 10:12:41 -0000
@@ -44,8 +44,10 @@
#include <errno.h>
#include <test.h>
#include <usctest.h>
+#include "compat_16.h"
-char *TCID = "getuid03";
+
+TCID_DEFINE(getuid03);
int TST_TOTAL = 1;
extern int Tst_count;
@@ -72,7 +74,7 @@
/* reset Tst_count in case we are looping */
Tst_count = 0;
- TEST(getuid());
+ TEST(GETUID());
if (TEST_RETURN < 0) {
tst_brkm(TBROK, cleanup, "This should never happen");
@@ -84,6 +86,12 @@
if (pwent == NULL) {
tst_resm(TFAIL, "getuid() returned unexpected "
"value %d", TEST_RETURN);
+ } else if (!UID_SIZE_CHECK(pwent->pw_uid)) {
+ tst_brkm(TBROK,
+ cleanup,
+ "uid(%d) is too large for testing getuid16",
+ TEST_RETURN);
+
} else {
if (pwent->pw_uid != TEST_RETURN) {
tst_resm(TFAIL, "getpwuid() value, %d, "
/*
*
* Copyright (c) Red Hat Inc., 2008
*
* 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
/* Author: Masatake YAMATO <[email protected]> */
#ifndef __GETUID_COMPAT_16_H__
#define __GETUID_COMPAT_16_H__
#include "linux_syscall_numbers.h"
#include "compat_uid.h"
#ifdef TST_USE_COMPAT16_SYSCALL
UID_T
GETUID(void)
{
return syscall(__NR_getuid);
}
UID_T
GETEUID(void)
{
return syscall(__NR_geteuid);
}
#else
UID_T
GETUID(void)
{
return getuid();
}
UID_T
GETEUID(void)
{
return geteuid();
}
#endif
#endif /* __GETUID_COMPAT_16_H__ */
/*
*
* Copyright (c) Red Hat Inc., 2009
*
* 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
/* Author: Masatake YAMATO <[email protected]> */
#ifndef __COMPAT_UID_16_H__
#define __COMPAT_UID_16_H__
#include <asm/posix_types.h>
#ifdef TST_USE_COMPAT16_SYSCALL
typedef __kernel_old_uid_t UID_T;
int
UID_SIZE_CHECK(uid_t uid)
{
/* See high2lowuid in linux/highuid.h
Return 0 if uid is too large to store
it to __kernel_old_uid_t. */
return ((uid) & ~0xFFFF)? 0: 1;
}
#else
typedef uid_t UID_T;
int
UID_SIZE_CHECK(uid_t uid)
{
return 1;
}
#endif
#endif /* __SETUID_COMPAT_16_H__ */
------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
Ltp-list mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ltp-list
