From: Cyril H. <su...@li...> - 2013-04-05 09:21:25
|
The branch, master, has been updated via 9828b2933643f7d73316715fa35e6753b6c0694a (commit) via 8773dec2218cb265160e7be7550f9a9db2ca64a8 (commit) from fdce7d5e2a219d201a2b0e3bab6b61b01ec1d716 (commit) - Log ----------------------------------------------------------------- commit 9828b2933643f7d73316715fa35e6753b6c0694a Author: Wanlong Gao <gao...@cn...> Date: Fri Apr 5 14:12:45 2013 +0800 getdents01: compare "." or ".." to the first entry If dir_index feature is enabled on ext3/4, the first entry may not be ".". So fix to compare "." or ".." to the first entry. Reported-by: DAN LI <li...@cn...> Signed-off-by: Wanlong Gao <gao...@cn...> Acked-by: Cyril Hrubis <ch...@su...> commit 8773dec2218cb265160e7be7550f9a9db2ca64a8 Author: Wanlong Gao <gao...@cn...> Date: Fri Apr 5 09:48:50 2013 +0800 runtest: remove getgroups{02,04} Since commit be0d9d6 wholly removed these two cases. Signed-off-by: Wanlong Gao <gao...@cn...> Acked-by: Cyril Hrubis <ch...@su...> ----------------------------------------------------------------------- Summary of changes: runtest/ltplite | 2 -- runtest/quickhit | 2 -- runtest/stress.part3 | 2 -- runtest/syscalls | 4 ---- testcases/kernel/syscalls/getdents/getdents01.c | 4 ++-- 5 files changed, 2 insertions(+), 12 deletions(-) diff --git a/runtest/ltplite b/runtest/ltplite index 35cbd44..2a704db 100644 --- a/runtest/ltplite +++ b/runtest/ltplite @@ -290,9 +290,7 @@ getgid01 getgid01 getgid03 getgid03 getgroups01 getgroups01 -getgroups02 getgroups02 getgroups03 getgroups03 -getgroups04 getgroups04 gethostid01 gethostid01 diff --git a/runtest/quickhit b/runtest/quickhit index ea3c9c1..c323d56 100644 --- a/runtest/quickhit +++ b/runtest/quickhit @@ -157,8 +157,6 @@ getgroups01 getgroups01 # where x is one less then what is returned by getgroups(0, gidset). # 4. Check to see if getgroups() succeeds and gidset contains # group id returned from getgid(). -getgroups02 getgroups02 -# Basic test for getgroups(2) gethostid01 gethostid01 # Basic test for gethostid(2) gethostname01 gethostname01 diff --git a/runtest/stress.part3 b/runtest/stress.part3 index f3c4287..b783b7f 100644 --- a/runtest/stress.part3 +++ b/runtest/stress.part3 @@ -229,8 +229,6 @@ getgid01 getgid01 getgid03 getgid03 getgroups01 getgroups01 -getgroups02 getgroups02 -getgroups04 getgroups04 gethostid01 gethostid01 diff --git a/runtest/syscalls b/runtest/syscalls index 758775b..f58b6a1 100644 --- a/runtest/syscalls +++ b/runtest/syscalls @@ -351,12 +351,8 @@ getgid03_16 getgid03_16 getgroups01 getgroups01 getgroups01_16 getgroups01_16 -getgroups02 getgroups02 -getgroups02_16 getgroups02_16 getgroups03 getgroups03 getgroups03_16 getgroups03_16 -getgroups04 getgroups04 -getgroups04_16 getgroups04_16 gethostid01 gethostid01 diff --git a/testcases/kernel/syscalls/getdents/getdents01.c b/testcases/kernel/syscalls/getdents/getdents01.c index fdfb1a0..10cdd55 100644 --- a/testcases/kernel/syscalls/getdents/getdents01.c +++ b/testcases/kernel/syscalls/getdents/getdents01.c @@ -107,8 +107,8 @@ int main(int ac, char **av) else d_name = dirp->d_name; - if (strcmp(d_name, ".")) - tst_resm(TFAIL, "First entry is not '.'"); + if (strcmp(d_name, ".") && strcmp(d_name, "..")) + tst_resm(TINFO, "First entry is not '.' or '..'"); else tst_resm(TPASS, "call succeeded"); hooks/post-receive -- ltp |