mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-03-19 21:59:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

go.bbclass: ptest cleanup and improvements

Browse Source 
* Don't enable verbose test output (-test.v)
  by default, as it generates too much noise
  for automated results parsing

* Override do_install_ptest_base in the bbclass,
  so recipes can provide their own modifications
  with do_install_ptest.

* Improve the generated run-ptest script to better
  handle large numbers of tests, and to generate
  'status: test name' output similar to Automake
  tests.

* Install all non-vendored 'testdata' directories
  from the source into the ptest package, as some
  packages share test data among multiple tests.

(From OE-Core rev: 11037462d80cefbee90a69e6a8a95895375ed6da)

Signed-off-by: Matt Madison <matt@madison.systems>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Matt Madison
2018-03-04 13:09:30 -08:00
committed by Richard Purdie
parent 02b8eae8c7
commit 13fd7abbe0
1 changed files with 51 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

87
meta/classes/go.bbclass
View File

@@ -26,7 +26,7 @@ GO_LDFLAGS ?= '-ldflags="${GO_RPATH} ${GO_LINKMODE} -extldflags '${GO_EXTLDFLAGS
export GOBUILDFLAGS ?= "-v ${GO_LDFLAGS}"
export GOPATH_OMIT_IN_ACTIONID ?= "1"
export GOPTESTBUILDFLAGS ?= "${GOBUILDFLAGS} -c"
export GOPTESTFLAGS ?= "-test.v"
export GOPTESTFLAGS ?= ""
GOBUILDFLAGS_prepend_task-compile = "${GO_PARALLEL_BUILD} "
export GO = "${HOST_PREFIX}go"
@@ -76,7 +76,7 @@ go_list_packages() {
}
go_list_package_tests() {
${GO} list -f '{{.ImportPath}} {{.TestGoFiles}}' ${GOBUILDFLAGS} ${GO_INSTALL} | \
${GO} list -f '{{.ImportPath}} {{.TestGoFiles}}' ${GOBUILDFLAGS} ${GO_INSTALL} | \
grep -v '\[\]$' | \
egrep -v '${GO_INSTALL_FILTEROUT}' | \
awk '{ print $1 }'
@@ -100,15 +100,16 @@ go_do_compile() {
do_compile[dirs] =+ "${GOTMPDIR}"
do_compile[cleandirs] = "${B}/bin ${B}/pkg"
do_compile_ptest() {
do_compile_ptest_base() {
export TMPDIR="${GOTMPDIR}"
rm -f ${B}/.go_compiled_tests.list
rm -f ${B}/.go_compiled_tests.list
go_list_package_tests | while read pkg; do
cd ${B}/src/$pkg
${GO} test ${GOPTESTBUILDFLAGS} $pkg
find . -mindepth 1 -maxdepth 1 -type f -name '*.test' -exec echo $pkg/{} \; | \
sed -e's,/\./,/,'>> ${B}/.go_compiled_tests.list
done
do_compile_ptest
}
do_compile_ptest_base[dirs] =+ "${GOTMPDIR}"
@@ -124,40 +125,54 @@ go_do_install() {
fi
}
do_install_ptest_base() {
test -f "${B}/.go_compiled_tests.list" || exit 0
tests=""
while read test; do
tests="$tests${tests:+ }${test%.test}"
testdir=`dirname $test`
install -d ${D}${PTEST_PATH}/$testdir
install -m 0755 ${B}/src/$test ${D}${PTEST_PATH}/$test
if [ -d "${B}/src/$testdir/testdata" ]; then
cp --preserve=mode,timestamps -R "${B}/src/$testdir/testdata" ${D}${PTEST_PATH}/$testdir
fi
done < ${B}/.go_compiled_tests.list
if [ -n "$tests" ]; then
install -d ${D}${PTEST_PATH}
cat >${D}${PTEST_PATH}/run-ptest <<EOF
go_make_ptest_wrapper() {
cat >${D}${PTEST_PATH}/run-ptest <<EOF
#!/bin/sh
ANYFAILED=0
for t in $tests; do
testdir=\`dirname \$t.test\`
if ( cd "${PTEST_PATH}/\$testdir"; "${PTEST_PATH}/\$t.test" ${GOPTESTFLAGS} | tee /dev/fd/9 | grep -q "^FAIL" ) 9>&1; then
ANYFAILED=1
fi
done
if [ \$ANYFAILED -ne 0 ]; then
echo "FAIL: ${PN}"
exit 1
fi
echo "PASS: ${PN}"
exit 0
RC=0
run_test() (
cd "\$1"
((((./\$2 ${GOPTESTFLAGS}; echo \$? >&3) | sed -r -e"s,^(PASS|SKIP|FAIL)\$,\\1: \$1/\$2," >&4) 3>&1) | (read rc; exit \$rc)) 4>&1
exit \$?)
EOF
chmod +x ${D}${PTEST_PATH}/run-ptest
else
rm -rf ${D}${PTEST_PATH}
fi
}
go_stage_testdata() {
oldwd="$PWD"
cd ${S}/src
find ${GO_IMPORT} -depth -type d -name testdata | while read d; do
if echo "$d" | grep -q '/vendor/'; then
continue
fi
parent=`dirname $d`
install -d ${D}${PTEST_PATH}/$parent
cp --preserve=mode,timestamps -R $d ${D}${PTEST_PATH}/$parent/
done
cd "$oldwd"
}
do_install_ptest_base() {
test -f "${B}/.go_compiled_tests.list" || exit 0
install -d ${D}${PTEST_PATH}
go_stage_testdata
go_make_ptest_wrapper
havetests=""
while read test; do
testdir=`dirname $test`
testprog=`basename $test`
install -d ${D}${PTEST_PATH}/$testdir
install -m 0755 ${B}/src/$test ${D}${PTEST_PATH}/$test
echo "run_test $testdir $testprog || RC=1" >> ${D}${PTEST_PATH}/run-ptest
havetests="yes"
done < ${B}/.go_compiled_tests.list
if [ -n "$havetests" ]; then
echo "exit \$RC" >> ${D}${PTEST_PATH}/run-ptest
chmod +x ${D}${PTEST_PATH}/run-ptest
else
rm -rf ${D}${PTEST_PATH}
fi
do_install_ptest
chown -R root:root ${D}${PTEST_PATH}
}
EXPORT_FUNCTIONS do_unpack do_configure do_compile do_install