[Ltp-cvs] [Git] ltp updated.

[Garrett C. <ris...@li...>]

The branch, master, has been updated
       via  00c8b3450d151482e9f7424224fc8a64bff27fdd (commit)
       via  a25f31b6f0a774b75ad2bf664f84ff0500086785 (commit)
       via  007dce57f645ad796f8cb60a13de936ac04fd1e8 (commit)
       via  71256e18bb4d21d1b82c4031a1983cb72ef215aa (commit)
      from  a3bb7abd2c1fb20dc4d93bef9cda2980f4339a6f (commit)


- Log -----------------------------------------------------------------
commit 00c8b3450d151482e9f7424224fc8a64bff27fdd
Merge: a25f31b6f0a774b75ad2bf664f84ff0500086785 a3bb7abd2c1fb20dc4d93bef9cda2980f4339a6f
Author: Garrett Cooper <yan...@gm...>
Date:   Wed Mar 10 20:29:15 2010 -0800

    Merge branch 'master' of ssh://yab...@lt.../gitroot/ltp/ltp-dev

commit a25f31b6f0a774b75ad2bf664f84ff0500086785
Author: Garrett Cooper <yan...@gm...>
Date:   Wed Mar 10 20:28:33 2010 -0800

    Update TODO with note about needing to replace pushd and popd logic in a few tests.
    
    Signed-off-by: Garrett Cooper <yan...@gm...>

commit 007dce57f645ad796f8cb60a13de936ac04fd1e8
Author: Garrett Cooper <yan...@gm...>
Date:   Wed Mar 10 20:26:15 2010 -0800

    Hi,
    
    I found following problem about "memcg_control" test.
    ---------
    /opt/ltp/testcases/bin/memcg_control_test.sh: line 30: [: : integer
    expression expected
    ----------
    
    This happens because of following process.
    [ memcg_control_test.sh: line 30 ]
    ---------
    if [ "$(grep -w memory /proc/cgroups | cut -f4)" -ne "1" ]; then
           echo "WARNING:"
           echo "Either kernel does not support memory resource controller or
    feature not ena
    bled"
           echo "Skipping all memcg_control testcases...."
           exit 0
    fi
    ---------
    
    "$(grep -w memory /proc/cgroups | cut -f4)" can't comparable with "1"
    if "$(grep -w memory /proc/cgroups | cut -f4)" = nothing.
    
    How about fixing like the other "memcg" tests?
    
    Signed-off-by: Yuki Yao<y_...@ry...>
    Acked-by: Garrett Cooper <yan...@gm...>

commit 71256e18bb4d21d1b82c4031a1983cb72ef215aa
Author: Garrett Cooper <yan...@gm...>
Date:   Mon Mar 8 08:53:05 2010 -0800

    Clean up comment to note the actual problem. It was confusing before.
    
    Signed-off-by: Garrett Cooper <yan...@gm...>

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

Summary of changes:
 TODO                                               |    6 ++++++
 .../memcg/control/memcg_control_test.sh            |    2 +-
 testcases/kernel/syscalls/libevent/buffer.c        |    4 ++--
 3 files changed, 9 insertions(+), 3 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/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