← Back to branch summary

~ubuntu-branches/ubuntu/precise/ruby1.9.1/precise-proposed

« back to all changes in this revision

Viewing changes to debian/patches/100327_r24850_bootstraptest_test_thread.dpatch

  • Committer: Bazaar Package Importer
  • Author(s): Daigo Moriwaki
  • Date: 2010-05-04 01:46:05 UTC
  • mfrom: (0.1.6 sid)
  • Revision ID: james.westby@ubuntu.com-20100504014605-mi8x6qo6xj12dap6
Tags: 1.9.1.378-3
* Added patches: 
  - debian/patches/100503_r27337_rb_string_value_cstr.dpatch
    Back port from the upstream r27337.
  - debian/patches/100503_r27356_queue_race.diff.dpatch
    Back port from the upstream r27356.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/100327_r24850_bootstraptest_test_thread.dpatch
 
1
#! /bin/sh /usr/share/dpatch/dpatch-run
 
2
## 100327_r24850_bootstraptest_test_thread.dpatch by Daigo Moriwaki <daigo@debian.org>
 
3
##
 
4
## All lines beginning with `## DP:' are a description of the patch.
 
5
## DP: Back port from the upstream r24850, fixing a test failure.
 
6
 
 
7
@DPATCH@
 
8
diff -urNad 20100327~/bootstraptest/test_thread.rb 20100327/bootstraptest/test_thread.rb
 
9
--- 20100327~/bootstraptest/test_thread.rb      2009-03-03 20:39:35.000000000 +0900
 
10
+++ 20100327/bootstraptest/test_thread.rb       2010-03-27 10:58:28.000000000 +0900
 
11
@@ -188,18 +188,18 @@
 
12
     Thread.current[:a]
 
13
   }.value + Thread.current[:a]
 
14
 }
 
15
-assert_equal %q{100}, %q{
 
16
+assert_normal_exit %q{
 
17
 begin
 
18
   100.times do |i|
 
19
     begin
 
20
-      Thread.start(Thread.current) {|u| u.raise }
 
21
+      th = Thread.start(Thread.current) {|u| u.raise }
 
22
       raise
 
23
     rescue
 
24
     ensure
 
25
+      th.join
 
26
     end
 
27
   end
 
28
 rescue
 
29
-  100
 
30
 end
 
31
 }, '[ruby-dev:31371]'
 
32