blob: 34a62207ec0096e545ea5929920311e6a121e1de [file] [log] [blame]
Brad Bishop1a4b7ee2018-12-16 17:11:34 -08001From 0077532b07e268347cb8557be6d70148d5f0e840 Mon Sep 17 00:00:00 2001
Patrick Williamsb48b7b42016-08-17 15:04:38 -05002From: Ting Liu <b28495@freescale.com>
3Date: Wed, 21 Aug 2013 15:44:57 +0800
4Subject: [PATCH] run_test.py: not use hard coded path ../obj/hugeadm
5
6Hard coded path makes the script impossible to run out of source tree.
7After 'make install', we can use hugeadm utility under DESTDIR.
8
9Upstream-Status: Submitted
10
11Signed-off-by: Ting Liu <b28495@freescale.com>
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080012
Brad Bishop868407c2019-11-04 13:24:47 -050013Update for 2.22.
14Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com>
Patrick Williamsb48b7b42016-08-17 15:04:38 -050015---
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080016 tests/run_tests.py | 12 +++++++++++-
17 1 file changed, 11 insertions(+), 1 deletion(-)
Patrick Williamsb48b7b42016-08-17 15:04:38 -050018
19diff --git a/tests/run_tests.py b/tests/run_tests.py
Brad Bishop868407c2019-11-04 13:24:47 -050020index 018264d..0aabcd1 100755
Patrick Williamsb48b7b42016-08-17 15:04:38 -050021--- a/tests/run_tests.py
22+++ b/tests/run_tests.py
Brad Bishop868407c2019-11-04 13:24:47 -050023@@ -245,9 +245,19 @@ def get_pagesizes():
Patrick Williamsb48b7b42016-08-17 15:04:38 -050024 Use libhugetlbfs' hugeadm utility to get a list of page sizes that have
25 active mount points and at least one huge page allocated to the pool.
26 """
27+ local_env = os.environ.copy()
28+ local_env["PATH"] = "../obj:%s" % local_env.get("PATH", "")
29 sizes = set()
30 out = ""
31- (rc, out) = bash("../obj/hugeadm --page-sizes")
32+ try:
33+ p = subprocess.Popen("hugeadm --page-sizes", shell=True, env=local_env, stdout=subprocess.PIPE)
34+ rc = p.wait()
35+ except KeyboardInterrupt:
36+ return sizes
37+ except OSError:
38+ return sizes
39+ out = p.stdout.read().strip()
40+
Brad Bishop868407c2019-11-04 13:24:47 -050041 if rc != 0 or out == "":
42 return sizes
Patrick Williamsb48b7b42016-08-17 15:04:38 -050043
Brad Bishop868407c2019-11-04 13:24:47 -050044--
452.7.4
46