3 files changed, 24 insertions, 78 deletions

diff --git a/meta/recipes-support/ptest-runner/files/ptest-runner b/meta/recipes-support/ptest-runner/files/ptest-runner
deleted file mode 100755
index 204cbdfc76..0000000000
--- a/meta/recipes-support/ptest-runner/files/ptest-runner
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/sh
-
-determine_ptests_to_run()
-{
-    for libdir in /usr/lib*
-    do
-        [ ! -d "$libdir" ] && continue
-
-        for x in `ls -d $libdir/*/ptest 2>/dev/null`
-        do
-            [ ! -f $x/run-ptest ] && continue
-            [ -h `dirname $x` ] && continue
-
-            #found a ptest in the system
-            PTEST_FOUND=$(basename $(dirname $x))
-
-            # when no pkg-names were specified, by default run each one
-            if [[ -z $@ ]]; then
-                printf " $x"
-            else
-                #check if this ptest has been asked for and add it
-                if [[ $@ =~ $PTEST_FOUND ]]; then
-                        printf " $x"
-                fi
-            fi
-        done
-    done
-}
-
-run_ptests()
-{
-    ANYFAILED=no
-
-    #the paths were sanity-checked in determine_ptests_to_run()
-    for ptst_path in $PTESTS_TO_RUN
-    do
-        date "+%Y-%m-%dT%H:%M"
-        echo "BEGIN: $ptst_path"
-        cd "$ptst_path"
-        ./run-ptest || ANYFAILED=yes
-        echo "END: $ptest_path"
-        date "+%Y-%m-%dT%H:%M"
-    done
-}
-
-echo "START: $0"
-PTESTS_TO_RUN=$(determine_ptests_to_run $@)
-run_ptests
-echo "STOP: $0"
-
-if [ "$ANYFAILED" = "yes"  ]; then
-    exit 1
-fi
-exit 0
diff --git a/meta/recipes-support/ptest-runner/ptest-runner_1.0.bb b/meta/recipes-support/ptest-runner/ptest-runner_1.0.bb
deleted file mode 100644
index bc1b0a4d46..0000000000
--- a/meta/recipes-support/ptest-runner/ptest-runner_1.0.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-SUMMARY = "A simple shell script to run all installed ptests"
-DESCRIPTION = "The ptest-runner package installs a ptest-runner \
-shell script which loops through all installed ptest test suites and \
-runs them in sequence."
-HOMEPAGE = "https://wiki.yoctoproject.org/wiki/Ptest"
-SRC_URI += "file://ptest-runner"
-
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690 \
-                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-
-INHIBIT_DEFAULT_DEPS = "1"
-
-S = "${WORKDIR}"
-
-do_install () {
-    mkdir -p ${D}${bindir}
-    install -m 0755 ${WORKDIR}/ptest-runner ${D}${bindir}
-}
-
-do_patch[noexec] = "1"
-do_configure[noexec] = "1"
-do_compile[noexec] = "1"
-do_build[noexec] = "1"
diff --git a/meta/recipes-support/ptest-runner/ptest-runner_2.0.bb b/meta/recipes-support/ptest-runner/ptest-runner_2.0.bb
new file mode 100644
index 0000000000..221cf6c287
--- /dev/null
+++ b/meta/recipes-support/ptest-runner/ptest-runner_2.0.bb
@@ -0,0 +1,24 @@
+SUMMARY = "A C program to run all installed ptests"
+DESCRIPTION = "The ptest-runner2 package installs a ptest-runner \
+program which loops through all installed ptest test suites and \
+runs them in sequence."
+HOMEPAGE = "https://github.com/alimon/ptest-runner2"
+
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=751419260aa954499f7abaabaa882bbe"
+
+SRCREV = "8bfdf946e784f4d5757bebee1fbc4b4a3d7a95c4"
+PV = "2.0+git${SRCPV}"
+
+SRC_URI = "git://github.com/alimon/ptest-runner2.git;protocol=https"
+S = "${WORKDIR}/git"
+
+FILES_${PN} = "${bindir}/ptest-runner"
+
+do_compile () {
+        oe_runmake
+}
+
+do_install () {
+        install -D -m 0755 ${WORKDIR}/git/ptest-runner ${D}${bindir}/ptest-runner
+}