Signed-off-by: CAI Qian <[email protected]>
---
 testcases/kernel/mem/cpuset/Makefile   |   25 +++++++++++++++++++++++++
 testcases/kernel/mem/cpuset/cpuset01.c |    6 +++---
 2 files changed, 28 insertions(+), 3 deletions(-)
 create mode 100644 testcases/kernel/mem/cpuset/Makefile

diff --git a/testcases/kernel/mem/cpuset/Makefile 
b/testcases/kernel/mem/cpuset/Makefile
new file mode 100644
index 0000000..822e783
--- /dev/null
+++ b/testcases/kernel/mem/cpuset/Makefile
@@ -0,0 +1,25 @@
+#
+#  Copyright (C) 2010  Red Hat, Inc.
+#
+#  This program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2 of the License, or (at
+#  your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful, but
+#  WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software
+#  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+#  02110-1301, USA.
+#
+
+top_srcdir              ?= ../../../..
+
+include $(top_srcdir)/include/mk/testcases.mk
+include $(top_srcdir)/include/mk/generic_leaf_target.mk
+
+LDLIBS                         += $(NUMA_LIBS) -lm
diff --git a/testcases/kernel/mem/cpuset/cpuset01.c 
b/testcases/kernel/mem/cpuset/cpuset01.c
index 966e826..27e2d68 100644
--- a/testcases/kernel/mem/cpuset/cpuset01.c
+++ b/testcases/kernel/mem/cpuset/cpuset01.c
@@ -58,7 +58,7 @@ extern int Tst_count;
 #define MAXNODES               512
 #define CPATH                  "/dev/cpuset"
 #define CPATH_NEW              "/dev/cpuset/1"
-#define _PATH_SYS_SYSTEM       "/sys/devices/system"
+#define PATH_SYS_SYSTEM                "/sys/devices/system"
 
 static pid_t *pids;
 volatile int end;
@@ -298,7 +298,7 @@ long count_numa(void)
 {
        int nnodes = 0;
 
-       while(path_exist(_PATH_SYS_SYSTEM "/node/node%d", nnodes))
+       while(path_exist(PATH_SYS_SYSTEM "/node/node%d", nnodes))
                nnodes++;
 
        return nnodes;
@@ -308,7 +308,7 @@ long count_cpu(void)
 {
        int ncpus = 0;
 
-       while(path_exist(_PATH_SYS_SYSTEM "/cpu/cpu%d", ncpus))
+       while(path_exist(PATH_SYS_SYSTEM "/cpu/cpu%d", ncpus))
                ncpus++;
 
        return ncpus;
-- 
1.7.3.2
From 31e342a342991c6dbd7ca43a4c5ec3e838226d77 Mon Sep 17 00:00:00 2001
From: CAI Qian <[email protected]>
Date: Fri, 31 Dec 2010 09:06:26 +0800
Subject: [PATCH] cpuset01: fix pathname to remove underscore


Signed-off-by: CAI Qian <[email protected]>
---
 testcases/kernel/mem/cpuset/Makefile   |   25 +++++++++++++++++++++++++
 testcases/kernel/mem/cpuset/cpuset01.c |    6 +++---
 2 files changed, 28 insertions(+), 3 deletions(-)
 create mode 100644 testcases/kernel/mem/cpuset/Makefile

diff --git a/testcases/kernel/mem/cpuset/Makefile b/testcases/kernel/mem/cpuset/Makefile
new file mode 100644
index 0000000..822e783
--- /dev/null
+++ b/testcases/kernel/mem/cpuset/Makefile
@@ -0,0 +1,25 @@
+#
+#  Copyright (C) 2010  Red Hat, Inc.
+#
+#  This program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2 of the License, or (at
+#  your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful, but
+#  WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software
+#  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+#  02110-1301, USA.
+#
+
+top_srcdir              ?= ../../../..
+
+include $(top_srcdir)/include/mk/testcases.mk
+include $(top_srcdir)/include/mk/generic_leaf_target.mk
+
+LDLIBS 			+= $(NUMA_LIBS) -lm
diff --git a/testcases/kernel/mem/cpuset/cpuset01.c b/testcases/kernel/mem/cpuset/cpuset01.c
index 966e826..27e2d68 100644
--- a/testcases/kernel/mem/cpuset/cpuset01.c
+++ b/testcases/kernel/mem/cpuset/cpuset01.c
@@ -58,7 +58,7 @@ extern int Tst_count;
 #define MAXNODES		512
 #define CPATH			"/dev/cpuset"
 #define CPATH_NEW		"/dev/cpuset/1"
-#define _PATH_SYS_SYSTEM	"/sys/devices/system"
+#define PATH_SYS_SYSTEM		"/sys/devices/system"
 
 static pid_t *pids;
 volatile int end;
@@ -298,7 +298,7 @@ long count_numa(void)
 {
 	int nnodes = 0;
 
-	while(path_exist(_PATH_SYS_SYSTEM "/node/node%d", nnodes))
+	while(path_exist(PATH_SYS_SYSTEM "/node/node%d", nnodes))
 		nnodes++;
 
 	return nnodes;
@@ -308,7 +308,7 @@ long count_cpu(void)
 {
 	int ncpus = 0;
 
-	while(path_exist(_PATH_SYS_SYSTEM "/cpu/cpu%d", ncpus))
+	while(path_exist(PATH_SYS_SYSTEM "/cpu/cpu%d", ncpus))
 		ncpus++;
 
 	return ncpus;
-- 
1.7.3.2

------------------------------------------------------------------------------
Learn how Oracle Real Application Clusters (RAC) One Node allows customers
to consolidate database storage, standardize their database environment, and, 
should the need arise, upgrade to a full multi-node Oracle RAC database 
without downtime or disruption
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
Ltp-list mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ltp-list

Reply via email to