summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndré Draszik <andre.draszik@jci.com>2019-10-01 15:29:56 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-10-23 16:30:36 +0100
commit6f4102f4f63cbd14d9d3df8157020c80fae2cdcc (patch)
tree39b40729ff43533826220b2b1489dc019f5cd0e8
parent0130498a8ff950b5b22d8da23e020b367801e959 (diff)
downloadpoky-6f4102f4f63cbd14d9d3df8157020c80fae2cdcc.tar.gz
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>
-rw-r--r--meta/recipes-devtools/ruby/ruby_2.6.4.bb13
1 files changed, 12 insertions, 1 deletions
diff --git a/meta/recipes-devtools/ruby/ruby_2.6.4.bb b/meta/recipes-devtools/ruby/ruby_2.6.4.bb
index 4554487c0a..fb202b8f1f 100644
--- a/meta/recipes-devtools/ruby/ruby_2.6.4.bb
+++ b/meta/recipes-devtools/ruby/ruby_2.6.4.bb
@@ -44,6 +44,14 @@ do_install_append_class-target () {
44 44
45do_install_ptest () { 45do_install_ptest () {
46 cp -rf ${S}/test ${D}${PTEST_PATH}/ 46 cp -rf ${S}/test ${D}${PTEST_PATH}/
47 # install test-binaries
48 find $(find ./.ext -path '*/-test-') -name '*.so' -print0 \
49 | tar --no-recursion --null -T - --no-same-owner --preserve-permissions -cf - \
50 | tar -C ${D}${libdir}/ruby/${SHRT_VER}.0/ --no-same-owner --preserve-permissions --strip-components=2 -xf -
51 # adjust path to not assume build directory layout
52 sed -e 's|File.expand_path(.*\.\./bin/erb[^)]*|File.expand_path("${bindir}/erb"|g' \
53 -i ${D}${PTEST_PATH}/test/erb/test_erb_command.rb
54
47 cp -r ${S}/include ${D}/${libdir}/ruby/ 55 cp -r ${S}/include ${D}/${libdir}/ruby/
48 test_case_rb=`grep rubygems/test_case.rb ${B}/.installed.list` 56 test_case_rb=`grep rubygems/test_case.rb ${B}/.installed.list`
49 sed -i -e 's:../../../test/:../../../ptest/test/:g' ${D}/$test_case_rb 57 sed -i -e 's:../../../test/:../../../ptest/test/:g' ${D}/$test_case_rb
@@ -61,6 +69,9 @@ FILES_${PN}-rdoc += "${libdir}/ruby/*/rdoc ${bindir}/rdoc"
61 69
62FILES_${PN} += "${datadir}/rubygems" 70FILES_${PN} += "${datadir}/rubygems"
63 71
64FILES_${PN}-ptest_append_class-target += "${libdir}/ruby/include" 72FILES_${PN}-ptest_append_class-target = "\
73 ${libdir}/ruby/include \
74 ${libdir}/ruby/${SHRT_VER}.0/*/-test- \
75"
65 76
66BBCLASSEXTEND = "native" 77BBCLASSEXTEND = "native"