From: Rishi k. K R. <ris...@li...> - 2010-03-31 10:04:49
|
The branch, next, has been updated via df6f6981dced07553a9978d05a5bdfd9b80e354d (commit) via c58cf0cff52cc72179c6fb4303509a3f2db19945 (commit) via 566d1af5a7111408601ea6cb64218585bee8d04a (commit) via b72a24c9eb339841a0c4b82d384a5b3ba10c9ecb (commit) via f102fd9735f01b4e2c9ae44f3c90d1a56d4d81f8 (commit) via 96a4822d72478abce6dceabc816f658ba4ded0d3 (commit) via 965127e99f1c3e4035a3de621ca0c295de14448b (commit) via 0a52859d55cf93cdd310ec678868cb4d10e80728 (commit) via d05498f44de5d3e542b2031b458d84e907604728 (commit) via 2784e9a6e36cacad4192f41a8c9044a85428ed27 (commit) via 615e1e37de053855b6bd56bae8b00d8a17133f8a (commit) via b8ed5460176838d9b714dddbc17685983b4a8b9b (commit) via e8e3c7598b82b54a7770c48a2422d5d6fa127045 (commit) from 391e757d43b3ac33a4a435e319ee77b1daa6da76 (commit) - Log ----------------------------------------------------------------- commit df6f6981dced07553a9978d05a5bdfd9b80e354d Author: Rishikesh K Rajak <ris...@li...> Date: Wed Mar 31 15:33:34 2010 +0530 Merge branches 'maint' and 'next' into next ----------------------------------------------------------------------- Summary of changes: testcases/kernel/controllers/cgroup_fj/Makefile | 2 +- testcases/kernel/device-drivers/rtc/Makefile | 4 ++-- testcases/network/multicast/mc_cmds/mc_cmds | 2 +- .../conformance/interfaces/sem_post/8-1.c | 4 +++- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/testcases/kernel/controllers/cgroup_fj/Makefile b/testcases/kernel/controllers/cgroup_fj/Makefile index e0524aa..d18e672 100644 --- a/testcases/kernel/controllers/cgroup_fj/Makefile +++ b/testcases/kernel/controllers/cgroup_fj/Makefile @@ -25,6 +25,6 @@ top_srcdir ?= ../../../.. include $(top_srcdir)/include/mk/testcases.mk include $(abs_srcdir)/../Makefile.inc -INSTALL_TARGETS := *.sh +INSTALL_TARGETS := *.sh cgroup_fj_release_agent include $(top_srcdir)/include/mk/generic_leaf_target.mk diff --git a/testcases/kernel/device-drivers/rtc/Makefile b/testcases/kernel/device-drivers/rtc/Makefile index 9b776ca..0eefcb0 100644 --- a/testcases/kernel/device-drivers/rtc/Makefile +++ b/testcases/kernel/device-drivers/rtc/Makefile @@ -23,7 +23,7 @@ SRC = rtc-test.c all: $(SRC) - $(CC) $(SRC) $(CFLAGS) $(LIBS) -o rtc-test + $(CC) $(SRC) $(CFLAGS) $(LIBS) -o rtc-test clean: - rm -f rtc-test + rm -f rtc-test diff --git a/testcases/network/multicast/mc_cmds/mc_cmds b/testcases/network/multicast/mc_cmds/mc_cmds index d537103..f43dd95 100755 --- a/testcases/network/multicast/mc_cmds/mc_cmds +++ b/testcases/network/multicast/mc_cmds/mc_cmds @@ -127,7 +127,7 @@ for eth in $IFNAME cat /proc/sys/net/ipv4/icmp_echo_ignore_broadcasts | grep 1 > /dev/null if [ $? -eq 0 ] then - end_testcase "Multicast ping disabled on this system (this is normal on post 2005 kernels)" + end_testcase "Multicast ping disabled on this system (this is normal on post year:2005 kernels)" fi # Do the ping tests: Execute ping 224.0.0.1 - Verify that the proper diff --git a/testcases/open_posix_testsuite/conformance/interfaces/sem_post/8-1.c b/testcases/open_posix_testsuite/conformance/interfaces/sem_post/8-1.c index b2db995..86007b7 100644 --- a/testcases/open_posix_testsuite/conformance/interfaces/sem_post/8-1.c +++ b/testcases/open_posix_testsuite/conformance/interfaces/sem_post/8-1.c @@ -161,7 +161,6 @@ int main() } fprintf(stderr, "P: child_1:%d forked\n", c_1); - sleep(1); c_2 = fork(); if (c_2 == 0) { @@ -198,6 +197,9 @@ int main() //printf("val = %d\n", val); } while (val != 0); */ + + /* Synchronization required before release the lock */ + sleep(1); /* Ok, let's release the lock */ fprintf(stderr, "P: release lock\n"); sem_post(sem); hooks/post-receive -- ltp |