| 1 |
graaff 10/11/03 18:37:47 |
| 2 |
|
| 3 |
Modified: ChangeLog json-1.4.6-r1.ebuild |
| 4 |
Log: |
| 5 |
Simplify running of tests to hopefully fix bug 325745. |
| 6 |
(Portage version: 2.1.8.3/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.50 dev-ruby/json/ChangeLog |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/json/ChangeLog?rev=1.50&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/json/ChangeLog?rev=1.50&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/json/ChangeLog?r1=1.49&r2=1.50 |
| 14 |
|
| 15 |
Index: ChangeLog |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/dev-ruby/json/ChangeLog,v |
| 18 |
retrieving revision 1.49 |
| 19 |
retrieving revision 1.50 |
| 20 |
diff -u -r1.49 -r1.50 |
| 21 |
--- ChangeLog 2 Nov 2010 06:24:34 -0000 1.49 |
| 22 |
+++ ChangeLog 3 Nov 2010 18:37:47 -0000 1.50 |
| 23 |
@@ -1,6 +1,9 @@ |
| 24 |
# ChangeLog for dev-ruby/json |
| 25 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/json/ChangeLog,v 1.49 2010/11/02 06:24:34 jer Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/json/ChangeLog,v 1.50 2010/11/03 18:37:47 graaff Exp $ |
| 28 |
+ |
| 29 |
+ 03 Nov 2010; Hans de Graaff <graaff@g.o> json-1.4.6-r1.ebuild: |
| 30 |
+ Simplify running of tests to hopefully fix bug 325745. |
| 31 |
|
| 32 |
02 Nov 2010; Jeroen Roovers <jer@g.o> json-1.4.6.ebuild: |
| 33 |
Stable for HPPA (bug #343473). |
| 34 |
|
| 35 |
|
| 36 |
|
| 37 |
1.2 dev-ruby/json/json-1.4.6-r1.ebuild |
| 38 |
|
| 39 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/json/json-1.4.6-r1.ebuild?rev=1.2&view=markup |
| 40 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/json/json-1.4.6-r1.ebuild?rev=1.2&content-type=text/plain |
| 41 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/json/json-1.4.6-r1.ebuild?r1=1.1&r2=1.2 |
| 42 |
|
| 43 |
Index: json-1.4.6-r1.ebuild |
| 44 |
=================================================================== |
| 45 |
RCS file: /var/cvsroot/gentoo-x86/dev-ruby/json/json-1.4.6-r1.ebuild,v |
| 46 |
retrieving revision 1.1 |
| 47 |
retrieving revision 1.2 |
| 48 |
diff -u -r1.1 -r1.2 |
| 49 |
--- json-1.4.6-r1.ebuild 31 Oct 2010 08:37:18 -0000 1.1 |
| 50 |
+++ json-1.4.6-r1.ebuild 3 Nov 2010 18:37:47 -0000 1.2 |
| 51 |
@@ -1,6 +1,6 @@ |
| 52 |
# Copyright 1999-2010 Gentoo Foundation |
| 53 |
# Distributed under the terms of the GNU General Public License v2 |
| 54 |
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/json/json-1.4.6-r1.ebuild,v 1.1 2010/10/31 08:37:18 graaff Exp $ |
| 55 |
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/json/json-1.4.6-r1.ebuild,v 1.2 2010/11/03 18:37:47 graaff Exp $ |
| 56 |
|
| 57 |
EAPI=2 |
| 58 |
USE_RUBY="ruby18 ree18 ruby19 jruby" |
| 59 |
@@ -44,17 +44,12 @@ |
| 60 |
} |
| 61 |
|
| 62 |
each_ruby_test() { |
| 63 |
- # We have to set RUBYLIB because otherwise the tests will run |
| 64 |
- # against the sytem-installed json; at the same time, we cannot |
| 65 |
- # use the -I parameter because rake won't let it pass to the |
| 66 |
- # testrb call that is executed down the road. |
| 67 |
- |
| 68 |
- RUBYLIB="${RUBYLIB}${RUBYLIB+:}lib:ext/json/ext" \ |
| 69 |
- ${RUBY} -S rake test_pure || die "pure ruby tests failed" |
| 70 |
+ JSON=pure \ |
| 71 |
+ ${RUBY} -Iext:lib -S testrb tests/*.rb || die "pure ruby tests failed" |
| 72 |
|
| 73 |
if [[ $(basename ${RUBY}) != "jruby" ]]; then |
| 74 |
- RUBYLIB="${RUBYLIB}${RUBYLIB+:}lib:ext" \ |
| 75 |
- ${RUBY} -Ilib:ext -S rake test_ext || die " ruby extension tests failed" |
| 76 |
+ JSON=ext \ |
| 77 |
+ ${RUBY} -Iext:lib -S testrb tests/*.rb || die "ext ruby tests failed" |
| 78 |
fi |
| 79 |
} |
Archives