[arch-commits] Commit in ruby-cgi/trunk (PKGBUILD ruby-cgi_fix_tests.patch)

[Andreas Schleifer]

    Date: Wednesday, August 31, 2022 @ 19:15:02
  Author: segaja
Revision: 1289220

upgpkg: ruby-cgi 0.3.2-3: fix tests

Modified:
  ruby-cgi/trunk/PKGBUILD
  ruby-cgi/trunk/ruby-cgi_fix_tests.patch

--------------------------+
 PKGBUILD                 |    9 ++++-----
 ruby-cgi_fix_tests.patch |   19 ++++++++++++++++++-
 2 files changed, 22 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-08-31 19:00:43 UTC (rev 1289219)
+++ PKGBUILD	2022-08-31 19:15:02 UTC (rev 1289220)
@@ -3,7 +3,7 @@
 _gemname='cgi'
 pkgname="ruby-${_gemname}"
 pkgver=0.3.2
-pkgrel=2
+pkgrel=3
 pkgdesc='Support for the Common Gateway Interface protocol.'
 arch=('x86_64')
 url="https://github.com/ruby/${_gemname}"
@@ -10,13 +10,12 @@
 license=('BSD' 'RUBY')
 depends=('ruby')
 makedepends=('ruby-rake-compiler')
-checkdepends=('ruby-rake')
+checkdepends=('ruby-cgi' 'ruby-rake')
 options=(!emptydirs)
 source=("${url}/archive/v${pkgver}/${pkgname}-${pkgver}.tar.gz"
-    "ruby-cgi_fix_tests.patch"
-    )
+    "ruby-cgi_fix_tests.patch")
 sha512sums=('8a92f58bb0d831a8786826d9755aeb2cc56241837a60893f730986da7cd3efb9b8b51f9eb1c42857fcbac30f0f15fee6cb93646b473585a0871c4b044a95061b'
-            '7370809302ab6654ddd903e963cab029731233a9dca485200d17e98e4ad8e167997c05998303c3795b8edc6b70a64c87545f4c88e8ed4c918d980f27f37ed294')
+            'c34deb31bd3510e3dc688a2f726090d423ebe604323f8351064c23db6ebbdb15e42e8275a784238f8529002705161c84d7ef2ababb7af6a9d8b9186758fcd7f7')
 
 prepare() {
   cd "${_gemname}-${pkgver}"

Modified: ruby-cgi_fix_tests.patch
===================================================================
--- ruby-cgi_fix_tests.patch	2022-08-31 19:00:43 UTC (rev 1289219)
+++ ruby-cgi_fix_tests.patch	2022-08-31 19:15:02 UTC (rev 1289220)
@@ -1,5 +1,5 @@
 diff --git a/test/lib/core_assertions.rb b/test/lib/core_assertions.rb
-index bac3856..69e1c7d 100644
+index bac3856..e668ac2 100644
 --- a/test/lib/core_assertions.rb
 +++ b/test/lib/core_assertions.rb
 @@ -45,7 +45,6 @@ module Test
@@ -10,3 +10,20 @@
          stdout, stderr, status = EnvUtil.invoke_ruby(args, test_stdin, true, true, **opt)
          desc = FailDesc[status, message, stderr]
          if block_given?
+@@ -110,7 +109,6 @@ module Test
+         token_re = Regexp.quote(token)
+         envs = args.shift if Array === args and Hash === args.first
+         args = [
+-          "--disable=gems",
+           "-r", File.expand_path("../memory_status", __FILE__),
+           *args,
+           "-v", "-",
+@@ -275,7 +273,7 @@ BEGIN {
+ #{line -= __LINE__; src}
+ eom
+         args = args.dup
+-        args.insert((Hash === args.first ? 1 : 0), "-w", "--disable=gems", *$:.map {|l| "-I#{l}"})
++        args.insert((Hash === args.first ? 1 : 0), "-w", *$:.map {|l| "-I#{l}"})
+         stdout, stderr, status = EnvUtil.invoke_ruby(args, src, capture_stdout, true, **opt)
+       ensure
+         if res_c