[Ltp-commits] [Git] ltp updated.

[Cyril H. <su...@li...>]

The branch, master, has been updated
       via  2fbbc93de713befa7298213d805ead34b7c3f00d (commit)
      from  786e3a19416149e6ae0b1394697e5aa9f653161d (commit)


- Log -----------------------------------------------------------------
commit 2fbbc93de713befa7298213d805ead34b7c3f00d
Author: Nageswara R Sastry <rns...@li...>
Date:   Mon Sep 12 17:25:19 2011 +0530

    KSM test case fixes - mmap10
    
    Disable mmap10 test if KSM is not configured
    
    P.S. patch checked with 'checkpatch.pl'
    
    # ./mmap10 -s
    mmap10      1  TCONF  :  KSM configuration is not enabled
    mmap10      2  TCONF  :  Remaining cases not appropriate for configuration
    
    Signed-off-by: Nageswara R Sastry <rns...@li...>
    
    --
    Regards
    R.Nageswara Sastry

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

Summary of changes:
 testcases/kernel/syscalls/mmap/mmap10.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
 
diff --git a/testcases/kernel/syscalls/mmap/mmap10.c b/testcases/kernel/syscalls/mmap/mmap10.c
index b735f5b..339f7da 100644
--- a/testcases/kernel/syscalls/mmap/mmap10.c
+++ b/testcases/kernel/syscalls/mmap/mmap10.c
@@ -64,6 +64,7 @@
 #include "config.h"
 
 #define SIZE (5*1024*1024)
+#define PATH_KSM "/sys/kernel/mm/ksm/"
 
 char *TCID = "mmap10";
 int TST_TOTAL = 1;
@@ -94,6 +95,8 @@ int main(int argc, char *argv[])
 
 	if (opt_ksm)
 	{
+		if (access(PATH_KSM, F_OK) == -1)
+			tst_brkm(TCONF, NULL, "KSM configuration is not enabled");
 #ifdef HAVE_MADV_MERGEABLE
 		tst_resm(TINFO, "add to KSM regions.");
 #else


hooks/post-receive
-- 
ltp