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

[Andreas Schleifer]

    Date: Saturday, September 10, 2022 @ 10:40:58
  Author: segaja
Revision: 1298803

upgpkg: ruby-cgi 0.3.2-7: re-enable check()

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-09-10 10:29:50 UTC (rev 1298802)
+++ PKGBUILD	2022-09-10 10:40:58 UTC (rev 1298803)
@@ -3,7 +3,7 @@
 _gemname='cgi'
 pkgname="ruby-${_gemname}"
 pkgver=0.3.2
-pkgrel=6
+pkgrel=7
 pkgdesc='Support for the Common Gateway Interface protocol.'
 arch=('x86_64')
 url="https://github.com/ruby/${_gemname}"
@@ -10,21 +10,17 @@
 license=('BSD' 'RUBY')
 depends=('ruby')
 makedepends=('ruby-rake-compiler')
-#checkdepends=('ruby-cgi' 'ruby-rake')
-#checkdepends=('ruby-rake')
+checkdepends=('ruby-rake')
 options=(!emptydirs)
 source=("${url}/archive/v${pkgver}/${pkgname}-${pkgver}.tar.gz"
-    "${pkgname}_fix_gemspec.patch"
-    "${pkgname}_fix_tests.patch")
+    "${pkgname}_fix_gemspec.patch")
 sha512sums=('8a92f58bb0d831a8786826d9755aeb2cc56241837a60893f730986da7cd3efb9b8b51f9eb1c42857fcbac30f0f15fee6cb93646b473585a0871c4b044a95061b'
-            'c1b8b1b7bc4274d3eedc75bad90d1a4a1149217cb2863269e6af1f69d240ac810642633cd42bd5ef1f0812d112a1ccb80c6268cf3d1282259638c2017085de39'
-            'c34deb31bd3510e3dc688a2f726090d423ebe604323f8351064c23db6ebbdb15e42e8275a784238f8529002705161c84d7ef2ababb7af6a9d8b9186758fcd7f7')
+            'c1b8b1b7bc4274d3eedc75bad90d1a4a1149217cb2863269e6af1f69d240ac810642633cd42bd5ef1f0812d112a1ccb80c6268cf3d1282259638c2017085de39')
 
 prepare() {
   cd "${_gemname}-${pkgver}"
 
   patch --verbose --strip=1 --input=../${pkgname}_fix_gemspec.patch
-  #patch --verbose --strip=1 --input=../${pkgname}_fix_tests.patch
 
   # update gemspec/Gemfile to allow newer version of the dependencies
   sed --in-place --regexp-extended 's|~>|>=|g' "${_gemname}.gemspec"
@@ -44,12 +40,12 @@
   rake build
 }
 
-#check() {
-#  cd "${_gemname}-${pkgver}"
-#
-#  rake test
-#}
+check() {
+  cd "${_gemname}-${pkgver}"
 
+  rake test
+}
+
 package() {
   cd "${_gemname}-${pkgver}"
 

Deleted: ruby-cgi_fix_tests.patch
===================================================================
--- ruby-cgi_fix_tests.patch	2022-09-10 10:29:50 UTC (rev 1298802)
+++ ruby-cgi_fix_tests.patch	2022-09-10 10:40:58 UTC (rev 1298803)
@@ -1,29 +0,0 @@
-diff --git a/test/lib/core_assertions.rb b/test/lib/core_assertions.rb
-index bac3856..e668ac2 100644
---- a/test/lib/core_assertions.rb
-+++ b/test/lib/core_assertions.rb
-@@ -45,7 +45,6 @@ module Test
-       def assert_in_out_err(args, test_stdin = "", test_stdout = [], test_stderr = [], message = nil,
-                             success: nil, **opt)
-         args = Array(args).dup
--        args.insert((Hash === args[0] ? 1 : 0), '--disable=gems')
-         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