diff options
| author |   Hans de Graaff <graaff@gentoo.org> | 2014-12-28 10:13:18 +0000 |
|---|---|---|
| committer | Hans de Graaff <graaff@gentoo.org> | 2014-12-28 10:13:18 +0000 |
| commit | 0e69c8f8ca213a5045765b2751632c02e4db7447 (patch) | |
| tree | ede6e2eca626ab50a4e99a3da40501adf116ecf3 /eclass | |
| parent | Stable for x86, wrt bug #532648 (diff) | |
| download | gentoo-2-0e69c8f8ca213a5045765b2751632c02e4db7447.tar.gz gentoo-2-0e69c8f8ca213a5045765b2751632c02e4db7447.tar.bz2 gentoo-2-0e69c8f8ca213a5045765b2751632c02e4db7447.zip | |
Add test recipe for rspec:3 slot.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/ruby-fakegem.eclass | 14 |
2 files changed, 15 insertions, 4 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 79589f7ef077..7d9bccd894f0 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1482 2014/12/28 07:23:56 graaff Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1483 2014/12/28 10:13:18 graaff Exp $ + + 28 Dec 2014; Hans de Graaff <graaff@gentoo.org> ruby-fakegem.eclass: + Add test recipe for rspec:3 slot. 28 Dec 2014; Hans de Graaff <graaff@gentoo.org> ruby-fakegem.eclass, ruby-ng.eclass: diff --git a/eclass/ruby-fakegem.eclass b/eclass/ruby-fakegem.eclass index 50da8876e314..2d362a727134 100644 --- a/eclass/ruby-fakegem.eclass +++ b/eclass/ruby-fakegem.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ruby-fakegem.eclass,v 1.43 2014/12/28 07:23:56 graaff Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ruby-fakegem.eclass,v 1.44 2014/12/28 10:13:18 graaff Exp $ # @ECLASS: ruby-fakegem.eclass # @MAINTAINER: @@ -35,6 +35,7 @@ inherit ruby-ng # Specify one of the default testing function for ruby-fakegem: # - rake (default; see also RUBY_FAKEGEM_TASK_TEST) # - rspec (calls ruby-ng_rspec, adds dev-ruby/rspec:2 to the dependencies) +# - rspec3 (calls ruby-ng_rspec, adds dev-ruby/rspec:3 to the dependencies) # - cucumber (calls ruby-ng_cucumber, adds dev-util/cucumber to the # dependencies; does not work on JRuby). # - none @@ -145,6 +146,10 @@ case ${RUBY_FAKEGEM_RECIPE_TEST} in # rspec-2 wrapper. ruby_add_bdepend "test? ( dev-ruby/rspec:2 >=dev-ruby/rspec-core-2.14.8-r2 )" ;; + rspec3) + IUSE+=" test" + ruby_add_bdepend "test? ( dev-ruby/rspec:3 )" + ;; cucumber) IUSE+=" test" # Unfortunately as of August 2012, cucumber is not supported on @@ -289,7 +294,7 @@ ruby_fakegem_genspec() { # so better taking this into consideration. local quoted_description=${DESCRIPTION//\"/\\\"} cat - > $1 <<EOF -# generated by ruby-fakegem.eclass $Revision: 1.43 $ +# generated by ruby-fakegem.eclass $Revision: 1.44 $ Gem::Specification.new do |s| s.name = "${RUBY_FAKEGEM_NAME}" s.version = "${RUBY_FAKEGEM_VERSION}" @@ -342,7 +347,7 @@ ruby_fakegem_binwrapper() { #!${rubycmd} # This is a simplified version of the RubyGems wrapper # -# Generated by ruby-fakegem.eclass $Revision: 1.43 $ +# Generated by ruby-fakegem.eclass $Revision: 1.44 $ require 'rubygems' @@ -440,6 +445,9 @@ each_fakegem_test() { rspec) RSPEC_VERSION=2 ruby-ng_rspec ;; + rspec3) + RSPEC_VERSION=3 ruby-ng_rspec + ;; cucumber) ruby-ng_cucumber ;; |