mirror of
https://git.yoctoproject.org/poky
synced 2026-04-05 08:02:25 +02:00
ruby: some ptest fixes
* the (new?) ruby expects some additional compiled libraries
to run, so we need to copy them as part of ptest.
Fixes errors like:
# ruby ./runner.rb ./-ext-/vm/test_at_exit.rb
Run options:
# Running tests:
[1/1] TestVM#test_at_exit = 0.06 s
1) Failure:
TestVM#test_at_exit [/usr/lib/ruby/ptest/test/-ext-/vm/test_at_exit.rb:7]:
1. [1/2] Assertion for "stdout"
| <["begin", "end"]> expected but was
| <[]>.
2. [2/2] Assertion for "stderr"
| <[]> expected but was
| <["-:1:in `require': cannot load such file -- -test-/vm/at_exit (LoadError)",
| "\tfrom -:1:in `<main>'"]>.
* the 'erb' test can't find the erb binary, as we're not
running this from within the build directory
(From OE-Core rev: 158d5285372240f6b3502a6c715a2491e37a3118)
Signed-off-by: André Draszik <andre.draszik@jci.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
0130498a8f
commit
6f4102f4f6
@@ -44,6 +44,14 @@ do_install_append_class-target () {
|
||||
|
||||
do_install_ptest () {
|
||||
cp -rf ${S}/test ${D}${PTEST_PATH}/
|
||||
# install test-binaries
|
||||
find $(find ./.ext -path '*/-test-') -name '*.so' -print0 \
|
||||
| tar --no-recursion --null -T - --no-same-owner --preserve-permissions -cf - \
|
||||
| tar -C ${D}${libdir}/ruby/${SHRT_VER}.0/ --no-same-owner --preserve-permissions --strip-components=2 -xf -
|
||||
# adjust path to not assume build directory layout
|
||||
sed -e 's|File.expand_path(.*\.\./bin/erb[^)]*|File.expand_path("${bindir}/erb"|g' \
|
||||
-i ${D}${PTEST_PATH}/test/erb/test_erb_command.rb
|
||||
|
||||
cp -r ${S}/include ${D}/${libdir}/ruby/
|
||||
test_case_rb=`grep rubygems/test_case.rb ${B}/.installed.list`
|
||||
sed -i -e 's:../../../test/:../../../ptest/test/:g' ${D}/$test_case_rb
|
||||
@@ -61,6 +69,9 @@ FILES_${PN}-rdoc += "${libdir}/ruby/*/rdoc ${bindir}/rdoc"
|
||||
|
||||
FILES_${PN} += "${datadir}/rubygems"
|
||||
|
||||
FILES_${PN}-ptest_append_class-target += "${libdir}/ruby/include"
|
||||
FILES_${PN}-ptest_append_class-target = "\
|
||||
${libdir}/ruby/include \
|
||||
${libdir}/ruby/${SHRT_VER}.0/*/-test- \
|
||||
"
|
||||
|
||||
BBCLASSEXTEND = "native"
|
||||
|
||||
Reference in New Issue
Block a user