diff options
| -rw-r--r-- | meta/conf/distro/include/ptest-packagelists.inc | 1 | ||||
| -rw-r--r-- | meta/recipes-support/numactl/numactl/Makefile | 7 | ||||
| -rwxr-xr-x | meta/recipes-support/numactl/numactl/run-ptest | 4 | ||||
| -rw-r--r-- | meta/recipes-support/numactl/numactl_git.bb | 12 |
4 files changed, 6 insertions, 18 deletions
diff --git a/meta/conf/distro/include/ptest-packagelists.inc b/meta/conf/distro/include/ptest-packagelists.inc index 9160103cb0a..8767c11af22 100644 --- a/meta/conf/distro/include/ptest-packagelists.inc +++ b/meta/conf/distro/include/ptest-packagelists.inc @@ -139,6 +139,5 @@ PTESTS_PROBLEMS = "\ libinput \ libpam \ libseccomp \ - numactl \ python3-numpy \ " diff --git a/meta/recipes-support/numactl/numactl/Makefile b/meta/recipes-support/numactl/numactl/Makefile deleted file mode 100644 index 9a5134c3f27..00000000000 --- a/meta/recipes-support/numactl/numactl/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -.PHONY: regress1 regress2 - -regress1: - cd test ; ./regress - -regress2: - cd test ; ./regress2 diff --git a/meta/recipes-support/numactl/numactl/run-ptest b/meta/recipes-support/numactl/numactl/run-ptest index e019b0d364e..c95ad8776da 100755 --- a/meta/recipes-support/numactl/numactl/run-ptest +++ b/meta/recipes-support/numactl/numactl/run-ptest @@ -3,8 +3,8 @@ # If there is numa support, run the tests. Otherwise skip all the tests. # Ideally the skipping would happen by the upstream tests. if ! numactl -s | grep -q "No NUMA support available on this system."; then - make regress1 - make regress2 + ./test/regress1 + ./test/regress2 if numademo -t -e 10M; then echo "PASS: numademo" else diff --git a/meta/recipes-support/numactl/numactl_git.bb b/meta/recipes-support/numactl/numactl_git.bb index 0f71258bc36..6045c9bc03b 100644 --- a/meta/recipes-support/numactl/numactl_git.bb +++ b/meta/recipes-support/numactl/numactl_git.bb @@ -15,7 +15,6 @@ PV = "2.0.16" SRC_URI = "git://github.com/numactl/numactl;branch=master;protocol=https \ file://Fix-the-test-output-format.patch \ - file://Makefile \ file://run-ptest \ file://0001-define-run-test-target.patch \ file://0001-configure-Check-for-largefile-support.patch \ @@ -39,23 +38,20 @@ do_compile_ptest() { do_install_ptest() { #install tests binaries - local test_binaries="distance ftok mbind_mig_pages migrate_pages move_pages \ + test_binaries="distance ftok mbind_mig_pages migrate_pages move_pages \ mynode nodemap node-parse pagesize prefered randmap realloc_test \ tbitmap tshared" - [ ! -d ${D}/${PTEST_PATH}/test ] && mkdir -p ${D}/${PTEST_PATH}/test + mkdir -p ${D}/${PTEST_PATH}/test for i in $test_binaries; do - install -m 0755 ${B}/test/.libs/$i ${D}${PTEST_PATH}/test + libtool --mode=install install -m 0755 ${B}/test/$i ${D}${PTEST_PATH}/test done - local test_scripts="checktopology checkaffinity printcpu regress regress2 \ + test_scripts="checktopology checkaffinity printcpu regress regress2 \ shmtest runltp bind_range" for i in $test_scripts; do install -m 0755 ${B}/test/$i ${D}${PTEST_PATH}/test done - - install -m 0755 ${WORKDIR}/Makefile ${D}${PTEST_PATH}/ - install -m 0755 ${B}/.libs/numactl ${D}${PTEST_PATH}/ } RDEPENDS:${PN}-ptest = "bash" |