[Ltp-cvs] [Git] ltp updated.

[Rishi k. K R. <ris...@li...>]

The branch, maint, has been updated
       via  2784e9a6e36cacad4192f41a8c9044a85428ed27 (commit)
       via  00c8b3450d151482e9f7424224fc8a64bff27fdd (commit)
       via  a25f31b6f0a774b75ad2bf664f84ff0500086785 (commit)
       via  007dce57f645ad796f8cb60a13de936ac04fd1e8 (commit)
       via  a3bb7abd2c1fb20dc4d93bef9cda2980f4339a6f (commit)
       via  737694964966bcf7a807b335d51923ee9c9c27a5 (commit)
       via  ce944320bea9e3d7044a36c64ef2e1719312370d (commit)
       via  71256e18bb4d21d1b82c4031a1983cb72ef215aa (commit)
      from  b8ed5460176838d9b714dddbc17685983b4a8b9b (commit)


- Log -----------------------------------------------------------------
commit 2784e9a6e36cacad4192f41a8c9044a85428ed27
Merge: b8ed5460176838d9b714dddbc17685983b4a8b9b 00c8b3450d151482e9f7424224fc8a64bff27fdd
Author: Rishikesh K Rajak <ris...@li...>
Date:   Sat Mar 13 12:49:29 2010 +0530

    Merge branches 'master' and 'maint' into maint

-----------------------------------------------------------------------

Summary of changes:
 TODO                                               |    6 ++++++
 .../memcg/control/memcg_control_test.sh            |    2 +-
 testcases/kernel/security/filecaps/Makefile        |    2 +-
 testcases/kernel/syscalls/libevent/buffer.c        |    4 ++--
 4 files changed, 10 insertions(+), 4 deletions(-)
 
diff --git a/TODO b/TODO
index 1756168..5e289ca 100644
--- a/TODO
+++ b/TODO
@@ -32,6 +32,9 @@ testcases/ballista:
 3. Uses cshell for some weird arse reason, instead of using Bourne shell
    compat scripts.
 
+testcases/kernel/controllers/freezer/libcgroup_freezer:
+1. Uses pushd / popd, which isn't present in busybox.
+
 testcases/kernel/fs/dmapi/Makefile:
 1. This test requires JFS support, which most systems don't have. So a set of
    proper autoconf tests need to be added for this as well.
@@ -86,6 +89,9 @@ testcases/network/stress/udp/...:
    that all of the scripts are being linked to the file
    $(abs_top_srcdir)/testcases/bin .
 
+testcases/realtime/run.sh:
+1. Uses pushd / popd, which isn't present in busybox.
+
 tools/Makefile:
 1. netpipe* needs fixing and reorg, because it's referencing /home/mpich, etc.
 
diff --git a/testcases/kernel/controllers/memcg/control/memcg_control_test.sh b/testcases/kernel/controllers/memcg/control/memcg_control_test.sh
index 5f52a18..d926041 100644
--- a/testcases/kernel/controllers/memcg/control/memcg_control_test.sh
+++ b/testcases/kernel/controllers/memcg/control/memcg_control_test.sh
@@ -27,7 +27,7 @@
 ##                                                                            ##
 ################################################################################
 
-if [ "$(grep -w memory /proc/cgroups | cut -f4)" -ne "1" ]; then
+if [ "x$(grep -w memory /proc/cgroups | cut -f4)" != "x1" ]; then
 	echo "WARNING:"
 	echo "Either kernel does not support memory resource controller or feature not enabled"
 	echo "Skipping all memcg_control testcases...."
diff --git a/testcases/kernel/security/filecaps/Makefile b/testcases/kernel/security/filecaps/Makefile
index acad441..d6efeee 100644
--- a/testcases/kernel/security/filecaps/Makefile
+++ b/testcases/kernel/security/filecaps/Makefile
@@ -22,7 +22,7 @@ top_srcdir		?= ../../../..
 
 include $(top_srcdir)/include/mk/testcases.mk
 
-INSTALL_TARGETS		:= filecapstest.sh
+INSTALL_TARGETS		:= *.sh
 
 CPPFLAGS		+= -D_GNU_SOURCE
 DEBUG_CPPFLAGS		+= -DDEBUG=1
diff --git a/testcases/kernel/syscalls/libevent/buffer.c b/testcases/kernel/syscalls/libevent/buffer.c
index 5fae50c..583b812 100644
--- a/testcases/kernel/syscalls/libevent/buffer.c
+++ b/testcases/kernel/syscalls/libevent/buffer.c
@@ -37,8 +37,8 @@
 
 #include <err.h>
 #include <errno.h>
-/* FIXME (garrcoop): this is a bug according to the manpage; need this for
- * vasprintf(3). */
+/* FIXME (garrcoop): this wasn't present in the upstream sources [is
+ * requirement according to the manpage for vasprintf(3)]. */
 #ifndef _GNU_SOURCE
 #define _GNU_SOURCE
 #endif


hooks/post-receive
-- 
ltp