From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from sog-mx-4.v43.ch3.sourceforge.com ([172.29.43.194] helo=mx.sourceforge.net) by sfs-ml-2.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1WehFs-0000NV-S2 for ltp-list@lists.sourceforge.net; Mon, 28 Apr 2014 08:49:40 +0000 Received: from [59.151.112.132] (helo=heian.cn.fujitsu.com) by sog-mx-4.v43.ch3.sourceforge.com with esmtp (Exim 4.76) id 1WehFr-0005iG-S5 for ltp-list@lists.sourceforge.net; Mon, 28 Apr 2014 08:49:40 +0000 Received: from G08CNEXCHPEKD02.g08.fujitsu.local (localhost.localdomain [127.0.0.1]) by edo.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id s3S8nSDR002319 for ; Mon, 28 Apr 2014 16:49:28 +0800 From: Xiaoguang Wang Date: Mon, 28 Apr 2014 16:47:14 +0800 Message-ID: <1398674834-1643-2-git-send-email-wangxg.fnst@cn.fujitsu.com> In-Reply-To: <1398674834-1643-1-git-send-email-wangxg.fnst@cn.fujitsu.com> References: <1398674834-1643-1-git-send-email-wangxg.fnst@cn.fujitsu.com> MIME-Version: 1.0 Subject: [LTP] [PATCH 2/2] kernel/mem/lib/mem.c: do the necessary cleanup work List-Id: Linux Test Project General Discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ltp-list-bounces@lists.sourceforge.net To: ltp-list@lists.sourceforge.net Oom01 case will modify "/proc/sys/vm/overcommit_memory" to have tests. In most systems, the overcommit_memory's default value is 0. When running oom01, if KSM configuration is not enabled, "tst_brkm(TCONF, NULL, ...)" will be called, in this case, we will forget to execute the restore operation defined in cleanup, and this will impact other test cases in LTP, for example, fork14 in RHEL5 will succeed unexpectedly. Signed-off-by: Xiaoguang Wang --- testcases/kernel/mem/lib/mem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testcases/kernel/mem/lib/mem.c b/testcases/kernel/mem/lib/mem.c index f145a2a..69a9014 100644 --- a/testcases/kernel/mem/lib/mem.c +++ b/testcases/kernel/mem/lib/mem.c @@ -146,7 +146,7 @@ void testoom(int mempolicy, int lite) oom(MLOCK, lite); if (access(PATH_KSM, F_OK) == -1) - tst_brkm(TCONF, NULL, "KSM configuration is not enabled"); + tst_brkm(TCONF, cleanup, "KSM configuration is not enabled"); tst_resm(TINFO, "start OOM testing for KSM pages."); oom(KSM, lite); -- 1.8.2.1 ------------------------------------------------------------------------------ "Accelerate Dev Cycles with Automated Cross-Browser Testing - For FREE Instantly run your Selenium tests across 300+ browser/OS combos. Get unparalleled scalability from the best Selenium testing platform available. Simple to use. Nothing to install. Get started now for free." http://p.sf.net/sfu/SauceLabs _______________________________________________ Ltp-list mailing list Ltp-list@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/ltp-list