summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-support/numactl
diff options
context:
space:
mode:
authorRoy Li <rongqing.li@windriver.com>2015-08-06 09:14:06 +0800
committerMartin Jansa <Martin.Jansa@gmail.com>2015-08-24 13:54:02 +0200
commit5003c4cc2d42575beca97e22a31b2d275ad5c558 (patch)
tree64c12d682dc00c6657b9f9b8746a8ccc75e9a445 /meta-oe/recipes-support/numactl
parentfe9d64dbf6a897de6813fe7a69ef305512c3d30b (diff)
downloadmeta-openembedded-5003c4cc2d42575beca97e22a31b2d275ad5c558.tar.gz
numactl: fix the ptest building
after upgrade, binary files are installed into test/.libs/, so fix the install ptest. redesign test Makefile rule Signed-off-by: Roy Li <rongqing.li@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support/numactl')
-rw-r--r--meta-oe/recipes-support/numactl/numactl/0001-define-run-test-target.patch32
-rw-r--r--meta-oe/recipes-support/numactl/numactl_2.0.10.bb21
2 files changed, 48 insertions, 5 deletions
diff --git a/meta-oe/recipes-support/numactl/numactl/0001-define-run-test-target.patch b/meta-oe/recipes-support/numactl/numactl/0001-define-run-test-target.patch
new file mode 100644
index 000000000..78ffb22f8
--- /dev/null
+++ b/meta-oe/recipes-support/numactl/numactl/0001-define-run-test-target.patch
@@ -0,0 +1,32 @@
1rename test target as run-test
2
3Upstream-Statue: Pending
4
5test target not only compile the test files, but also run them, which is
6not suitable for cross-compile environment, so rename it as run-test.
7
8and define test target to compile the test files.
9
10Signed-off-by: Roy Li <rongqing.li@windriver.com>
11---
12 Makefile.am | 4 +++-
13 1 file changed, 3 insertions(+), 1 deletion(-)
14
15diff --git a/Makefile.am b/Makefile.am
16index b6db339..de176c4 100644
17--- a/Makefile.am
18+++ b/Makefile.am
19@@ -124,7 +124,9 @@ regress2: $(check_PROGRAMS)
20 test_numademo: numademo
21 ./numademo -t -e 10M
22
23-test: all $(check_PROGRAMS) regress1 regress2 test_numademo
24+test: all $(check_PROGRAMS)
25+
26+run-test: all $(check_PROGRAMS) regress1 regress2 test_numademo
27
28 TESTS_ENVIRONMENT = builddir='$(builddir)'; export builddir;
29
30--
311.9.1
32
diff --git a/meta-oe/recipes-support/numactl/numactl_2.0.10.bb b/meta-oe/recipes-support/numactl/numactl_2.0.10.bb
index 3a10ebbee..8f27b156b 100644
--- a/meta-oe/recipes-support/numactl/numactl_2.0.10.bb
+++ b/meta-oe/recipes-support/numactl/numactl_2.0.10.bb
@@ -15,6 +15,7 @@ SRC_URI = "ftp://oss.sgi.com/www/projects/libnuma/download/${BPN}-${PV}.tar.gz \
15 file://Fix-the-test-output-format.patch \ 15 file://Fix-the-test-output-format.patch \
16 file://Makefile \ 16 file://Makefile \
17 file://run-ptest \ 17 file://run-ptest \
18 file://0001-define-run-test-target.patch \
18 " 19 "
19SRC_URI[md5sum] = "682c38305b2596967881f3d77bc3fc9c" 20SRC_URI[md5sum] = "682c38305b2596967881f3d77bc3fc9c"
20SRC_URI[sha256sum] = "dbdac8fe74f13b2e2864bba352f1597ab1d3345c8c485d7805f58d66f414db61" 21SRC_URI[sha256sum] = "dbdac8fe74f13b2e2864bba352f1597ab1d3345c8c485d7805f58d66f414db61"
@@ -28,19 +29,29 @@ do_install() {
28 rm -r ${D}${mandir}/man2 29 rm -r ${D}${mandir}/man2
29} 30}
30 31
32do_compile_ptest() {
33 oe_runmake test
34}
35
31do_install_ptest() { 36do_install_ptest() {
32 #install tests binaries 37 #install tests binaries
33 local test_binaries="checkaffinity checktopology distance \ 38 local test_binaries="distance ftok mbind_mig_pages migrate_pages move_pages \
34 ftok mbind_mig_pages migrate_pages move_pages mynode \ 39 mynode nodemap node-parse pagesize prefered randmap realloc_test \
35 nodemap pagesize prefered printcpu randmap realloc_test \ 40 tbitmap tshared"
36 regress regress2 runltp shmtest tbitmap tshared bind_range"
37 41
38 [ ! -d ${D}/${PTEST_PATH}/test ] && mkdir -p ${D}/${PTEST_PATH}/test 42 [ ! -d ${D}/${PTEST_PATH}/test ] && mkdir -p ${D}/${PTEST_PATH}/test
39 for i in $test_binaries; do 43 for i in $test_binaries; do
44 install -m 0755 ${B}/test/.libs/$i ${D}${PTEST_PATH}/test
45 done
46
47 local test_scripts="checktopology checkaffinity printcpu regress regress2 \
48 shmtest runltp bind_range"
49 for i in $test_scripts; do
40 install -m 0755 ${B}/test/$i ${D}${PTEST_PATH}/test 50 install -m 0755 ${B}/test/$i ${D}${PTEST_PATH}/test
41 done 51 done
52
42 install -m 0755 ${WORKDIR}/Makefile ${D}${PTEST_PATH}/ 53 install -m 0755 ${WORKDIR}/Makefile ${D}${PTEST_PATH}/
43 install -m 0755 ${B}/numactl ${D}${PTEST_PATH}/ 54 install -m 0755 ${B}/.libs/numactl ${D}${PTEST_PATH}/
44} 55}
45 56
46RDEPENDS_${PN}-ptest = "bash" 57RDEPENDS_${PN}-ptest = "bash"