diff options
author | Jiaying Song <jiaying.song.cn@windriver.com> | 2025-08-27 10:38:28 +0800 |
---|---|---|
committer | Steve Sakoman <steve@sakoman.com> | 2025-09-01 08:30:57 -0700 |
commit | 844ad4dc30806239950205d8fb426f7bf7c162ab (patch) | |
tree | 2642b299cb800e265d7eecdcebd6baa810417f08 | |
parent | 285b5070bbc877f08bfa088981e1e02831f855d0 (diff) | |
download | poky-844ad4dc30806239950205d8fb426f7bf7c162ab.tar.gz |
ruby-ptest : some ptest fixes
- Skip the test_rm_r_no_permissions test under the root user, as
deletion always succeeds.
- Filter out tests under the -ext- directory in run-ptest. Due to the
commit [1],the packaging of .so test files under the .ext directory
was removed. As a result, adjust the test filtering rules to avoid
test failures caused by missing files.
- Add installation of rdoc.rb and did_you_mean.rb files in
do_install_ptest to ensure complete test dependencies.
- Add init.rb file to PTEST installation path.
(From OE-Core rev: fbbfbfd59fe74c6f742af29d32fae1327068b9ff)
Signed-off-by: Jiaying Song <jiaying.song.cn@windriver.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
3 files changed, 36 insertions, 3 deletions
diff --git a/meta/recipes-devtools/ruby/ruby/0007-Skip-test_rm_r_no_permissions-test-under-root.patch b/meta/recipes-devtools/ruby/ruby/0007-Skip-test_rm_r_no_permissions-test-under-root.patch new file mode 100644 index 0000000000..dc06891bbc --- /dev/null +++ b/meta/recipes-devtools/ruby/ruby/0007-Skip-test_rm_r_no_permissions-test-under-root.patch | |||
@@ -0,0 +1,30 @@ | |||
1 | From cc5e563f0fa5212e4a624b954fbc97cc6d8900d4 Mon Sep 17 00:00:00 2001 | ||
2 | From: Jiaying Song <jiaying.song.cn@windriver.com> | ||
3 | Date: Mon, 25 Aug 2025 16:31:18 +0800 | ||
4 | Subject: [PATCH] Skip test_rm_r_no_permissions test under root | ||
5 | |||
6 | Skip the test_rm_r_no_permissions test under the root user, as deletion always succeeds. | ||
7 | |||
8 | Upstream-Status: Submitted [https://github.com/ruby/fileutils/pull/133/commits/3c831389c5e1523af5869d025f573ff043486b99] | ||
9 | |||
10 | Signed-off-by: Jiaying Song <jiaying.song.cn@windriver.com> | ||
11 | --- | ||
12 | test/fileutils/test_fileutils.rb | 2 +- | ||
13 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
14 | |||
15 | diff --git a/test/fileutils/test_fileutils.rb b/test/fileutils/test_fileutils.rb | ||
16 | index 481f913..a2ed414 100644 | ||
17 | --- a/test/fileutils/test_fileutils.rb | ||
18 | +++ b/test/fileutils/test_fileutils.rb | ||
19 | @@ -757,7 +757,7 @@ class TestFileUtils < Test::Unit::TestCase | ||
20 | def test_rm_r_no_permissions | ||
21 | check_singleton :rm_rf | ||
22 | |||
23 | - return if /mswin|mingw/ =~ RUBY_PLATFORM | ||
24 | + return if /mswin|mingw/ =~ RUBY_PLATFORM || root_in_posix? | ||
25 | |||
26 | mkdir 'tmpdatadir' | ||
27 | touch 'tmpdatadir/tmpdata' | ||
28 | -- | ||
29 | 2.34.1 | ||
30 | |||
diff --git a/meta/recipes-devtools/ruby/ruby/run-ptest b/meta/recipes-devtools/ruby/ruby/run-ptest index de7c415aba..17404e3509 100644 --- a/meta/recipes-devtools/ruby/ruby/run-ptest +++ b/meta/recipes-devtools/ruby/ruby/run-ptest | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/bin/sh | 1 | #!/bin/sh |
2 | 2 | ||
3 | test_fullname=`find test -name test_*.rb` | 3 | test_fullname=$(find test -name test_*.rb | grep -v '/-ext-/') |
4 | 4 | ||
5 | for i in ${test_fullname}; do | 5 | for i in ${test_fullname}; do |
6 | ruby ./test/runner.rb ${i} 2>&1 > /dev/null | 6 | ruby ./test/runner.rb ${i} 2>&1 > /dev/null |
diff --git a/meta/recipes-devtools/ruby/ruby_3.3.5.bb b/meta/recipes-devtools/ruby/ruby_3.3.5.bb index b37f0d03e7..8b45946f6b 100644 --- a/meta/recipes-devtools/ruby/ruby_3.3.5.bb +++ b/meta/recipes-devtools/ruby/ruby_3.3.5.bb | |||
@@ -30,7 +30,8 @@ SRC_URI = "http://cache.ruby-lang.org/pub/ruby/${SHRT_VER}/ruby-${PV}.tar.gz \ | |||
30 | file://CVE-2025-27220.patch \ | 30 | file://CVE-2025-27220.patch \ |
31 | file://CVE-2025-27221-0001.patch \ | 31 | file://CVE-2025-27221-0001.patch \ |
32 | file://CVE-2025-27221-0002.patch \ | 32 | file://CVE-2025-27221-0002.patch \ |
33 | " | 33 | file://0007-Skip-test_rm_r_no_permissions-test-under-root.patch \ |
34 | " | ||
34 | UPSTREAM_CHECK_URI = "https://www.ruby-lang.org/en/downloads/" | 35 | UPSTREAM_CHECK_URI = "https://www.ruby-lang.org/en/downloads/" |
35 | 36 | ||
36 | inherit autotools ptest pkgconfig | 37 | inherit autotools ptest pkgconfig |
@@ -102,11 +103,13 @@ do_install:append:class-target () { | |||
102 | 103 | ||
103 | do_install_ptest () { | 104 | do_install_ptest () { |
104 | cp -rf ${S}/test ${D}${PTEST_PATH}/ | 105 | cp -rf ${S}/test ${D}${PTEST_PATH}/ |
105 | 106 | install -D ${S}/tool/test/init.rb ${D}${PTEST_PATH}/tool/test/init.rb | |
106 | install -D ${S}/tool/test/runner.rb ${D}${PTEST_PATH}/tool/test/runner.rb | 107 | install -D ${S}/tool/test/runner.rb ${D}${PTEST_PATH}/tool/test/runner.rb |
107 | cp -r ${S}/tool/lib ${D}${PTEST_PATH}/tool/ | 108 | cp -r ${S}/tool/lib ${D}${PTEST_PATH}/tool/ |
108 | mkdir -p ${D}${PTEST_PATH}/lib | 109 | mkdir -p ${D}${PTEST_PATH}/lib |
109 | cp -r ${S}/lib/did_you_mean ${S}/lib/rdoc ${D}${PTEST_PATH}/lib | 110 | cp -r ${S}/lib/did_you_mean ${S}/lib/rdoc ${D}${PTEST_PATH}/lib |
111 | cp ${D}${libdir}/ruby/${SHRT_VER}.0/rdoc.rb ${D}${PTEST_PATH}/lib | ||
112 | cp ${D}${libdir}/ruby/${SHRT_VER}.0/did_you_mean.rb ${D}${PTEST_PATH}/lib | ||
110 | 113 | ||
111 | # install test-binaries | 114 | # install test-binaries |
112 | # These .so files have sporadic reproducibility fails as seen here: | 115 | # These .so files have sporadic reproducibility fails as seen here: |