diff options
5 files changed, 0 insertions, 174 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 deleted file mode 100644 index 78ffb22f89..0000000000 --- a/meta-oe/recipes-support/numactl/numactl/0001-define-run-test-target.patch +++ /dev/null | |||
@@ -1,32 +0,0 @@ | |||
1 | rename test target as run-test | ||
2 | |||
3 | Upstream-Statue: Pending | ||
4 | |||
5 | test target not only compile the test files, but also run them, which is | ||
6 | not suitable for cross-compile environment, so rename it as run-test. | ||
7 | |||
8 | and define test target to compile the test files. | ||
9 | |||
10 | Signed-off-by: Roy Li <rongqing.li@windriver.com> | ||
11 | --- | ||
12 | Makefile.am | 4 +++- | ||
13 | 1 file changed, 3 insertions(+), 1 deletion(-) | ||
14 | |||
15 | diff --git a/Makefile.am b/Makefile.am | ||
16 | index 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 | -- | ||
31 | 1.9.1 | ||
32 | |||
diff --git a/meta-oe/recipes-support/numactl/numactl/Fix-the-test-output-format.patch b/meta-oe/recipes-support/numactl/numactl/Fix-the-test-output-format.patch deleted file mode 100644 index 9812ecc8b3..0000000000 --- a/meta-oe/recipes-support/numactl/numactl/Fix-the-test-output-format.patch +++ /dev/null | |||
@@ -1,64 +0,0 @@ | |||
1 | From 59fd750a84bbe5874dec936d2bee9ef11a1b6505 Mon Sep 17 00:00:00 2001 | ||
2 | From: Li xin <lixin.fnst@cn.fujitsu.com> | ||
3 | Date: Tue, 21 Jul 2015 02:01:22 +0900 | ||
4 | Subject: [PATCH] Fix the test output format | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | |||
8 | Signed-off-by: Roy Li <rongqing.li@windriver.com> | ||
9 | Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> | ||
10 | --- | ||
11 | test/regress | 6 +++--- | ||
12 | test/regress2 | 11 +++++------ | ||
13 | 2 files changed, 8 insertions(+), 9 deletions(-) | ||
14 | |||
15 | diff --git a/test/regress b/test/regress | ||
16 | index 2ce1705..d086a47 100755 | ||
17 | --- a/test/regress | ||
18 | +++ b/test/regress | ||
19 | @@ -74,6 +74,7 @@ probe_hardware() | ||
20 | if [ $numnodes -lt 2 ] ; then | ||
21 | echo "need at least two nodes with at least $NEEDPAGES each of" | ||
22 | echo "free memory for mempolicy regression tests" | ||
23 | + echo "FAIL: numa regress" | ||
24 | exit 77 # Skip test | ||
25 | fi | ||
26 | } | ||
27 | @@ -207,10 +208,9 @@ main() | ||
28 | rm A B | ||
29 | |||
30 | if [ "$EXIT" = 0 ] ; then | ||
31 | - echo '========SUCCESS' | ||
32 | + echo 'PASS: numactl regress' | ||
33 | else | ||
34 | - echo '========FAILURE' | ||
35 | - exit 1 | ||
36 | + echo 'FAIL: numactl regress' | ||
37 | fi | ||
38 | } | ||
39 | |||
40 | diff --git a/test/regress2 b/test/regress2 | ||
41 | index aa6ea41..450c510 100755 | ||
42 | --- a/test/regress2 | ||
43 | +++ b/test/regress2 | ||
44 | @@ -9,12 +9,11 @@ testdir=`dirname "$0"` | ||
45 | export PATH=${builddir}:$PATH | ||
46 | |||
47 | T() { | ||
48 | - echo "$@" | ||
49 | - if ! $VALGRIND "$@" ; then | ||
50 | - echo $1 FAILED!!!! | ||
51 | - exit 1 | ||
52 | - fi | ||
53 | - echo | ||
54 | + if ! $VALGRIND "$@" 2>&1 1>/dev/null; then | ||
55 | + echo "FAIL: $1" | ||
56 | + else | ||
57 | + echo "PASS: $1" | ||
58 | + fi | ||
59 | } | ||
60 | |||
61 | # still broken | ||
62 | -- | ||
63 | 1.8.4.2 | ||
64 | |||
diff --git a/meta-oe/recipes-support/numactl/numactl/Makefile b/meta-oe/recipes-support/numactl/numactl/Makefile deleted file mode 100644 index 9a5134c3f2..0000000000 --- a/meta-oe/recipes-support/numactl/numactl/Makefile +++ /dev/null | |||
@@ -1,7 +0,0 @@ | |||
1 | .PHONY: regress1 regress2 | ||
2 | |||
3 | regress1: | ||
4 | cd test ; ./regress | ||
5 | |||
6 | regress2: | ||
7 | cd test ; ./regress2 | ||
diff --git a/meta-oe/recipes-support/numactl/numactl/run-ptest b/meta-oe/recipes-support/numactl/numactl/run-ptest deleted file mode 100755 index 215f7c25b9..0000000000 --- a/meta-oe/recipes-support/numactl/numactl/run-ptest +++ /dev/null | |||
@@ -1,9 +0,0 @@ | |||
1 | #!/bin/sh | ||
2 | make regress1 | ||
3 | make regress2 | ||
4 | if numademo -t -e 10M; then | ||
5 | echo "PASS: numademo" | ||
6 | else | ||
7 | echo "FAIL: numademo" | ||
8 | fi | ||
9 | |||
diff --git a/meta-oe/recipes-support/numactl/numactl_git.bb b/meta-oe/recipes-support/numactl/numactl_git.bb deleted file mode 100644 index 504fe03275..0000000000 --- a/meta-oe/recipes-support/numactl/numactl_git.bb +++ /dev/null | |||
@@ -1,62 +0,0 @@ | |||
1 | SUMMARY = "Development package for building Applications that use numa" | ||
2 | HOMEPAGE = "http://oss.sgi.com/projects/libnuma/" | ||
3 | DESCRIPTION = "Simple NUMA policy support. It consists of a numactl program \ | ||
4 | to run other programs with a specific NUMA policy and a libnuma to do \ | ||
5 | allocations with NUMA policy in applications." | ||
6 | LICENSE = "GPL-2.0 & LGPL-2.1" | ||
7 | SECTION = "apps" | ||
8 | |||
9 | inherit autotools-brokensep ptest | ||
10 | |||
11 | LIC_FILES_CHKSUM = "file://README.md;beginline=19;endline=32;md5=f8ff2391624f28e481299f3f677b21bb" | ||
12 | |||
13 | SRCREV = "dd6de072c92c892a86e18c0fd0dfa1ba57a9a05d" | ||
14 | PV = "2.0.14+git${SRCPV}" | ||
15 | |||
16 | SRC_URI = "git://github.com/numactl/numactl \ | ||
17 | file://Fix-the-test-output-format.patch \ | ||
18 | file://Makefile \ | ||
19 | file://run-ptest \ | ||
20 | file://0001-define-run-test-target.patch \ | ||
21 | " | ||
22 | |||
23 | S = "${WORKDIR}/git" | ||
24 | |||
25 | # ARM does not currently support NUMA | ||
26 | COMPATIBLE_HOST = "^((?!arm).*)$" | ||
27 | |||
28 | LDFLAGS_append_riscv64 = " -latomic" | ||
29 | LDFLAGS_append_riscv32 = " -latomic" | ||
30 | |||
31 | do_install() { | ||
32 | oe_runmake DESTDIR=${D} prefix=${D}/usr install | ||
33 | #remove the empty man2 directory | ||
34 | rm -r ${D}${mandir}/man2 | ||
35 | } | ||
36 | |||
37 | do_compile_ptest() { | ||
38 | oe_runmake test | ||
39 | } | ||
40 | |||
41 | do_install_ptest() { | ||
42 | #install tests binaries | ||
43 | local test_binaries="distance ftok mbind_mig_pages migrate_pages move_pages \ | ||
44 | mynode nodemap node-parse pagesize prefered randmap realloc_test \ | ||
45 | tbitmap tshared" | ||
46 | |||
47 | [ ! -d ${D}/${PTEST_PATH}/test ] && mkdir -p ${D}/${PTEST_PATH}/test | ||
48 | for i in $test_binaries; do | ||
49 | install -m 0755 ${B}/test/.libs/$i ${D}${PTEST_PATH}/test | ||
50 | done | ||
51 | |||
52 | local test_scripts="checktopology checkaffinity printcpu regress regress2 \ | ||
53 | shmtest runltp bind_range" | ||
54 | for i in $test_scripts; do | ||
55 | install -m 0755 ${B}/test/$i ${D}${PTEST_PATH}/test | ||
56 | done | ||
57 | |||
58 | install -m 0755 ${WORKDIR}/Makefile ${D}${PTEST_PATH}/ | ||
59 | install -m 0755 ${B}/.libs/numactl ${D}${PTEST_PATH}/ | ||
60 | } | ||
61 | |||
62 | RDEPENDS_${PN}-ptest = "bash" | ||