Author: donaldp
Date: Sun May 20 00:41:32 2012
New Revision: 1340602
URL: http://svn.apache.org/viewvc?rev=1340602&view=rev
Log:
Migrate some requires out of the buildr.rb ad back into test_result as this
file is required directly by the bdd extension
Modified:
buildr/trunk/lib/buildr.rb
buildr/trunk/lib/buildr/java/test_result.rb
Modified: buildr/trunk/lib/buildr.rb
URL:
http://svn.apache.org/viewvc/buildr/trunk/lib/buildr.rb?rev=1340602&r1=1340601&r2=1340602&view=diff
==============================================================================
--- buildr/trunk/lib/buildr.rb (original)
+++ buildr/trunk/lib/buildr.rb Sun May 20 00:41:32 2012
@@ -35,9 +35,6 @@ require 'find'
require 'uri'
require 'stringio'
require 'fileutils'
-require 'yaml' # From test_result.rb: necessary to require YAML even if it is
mentioned by autoload as it fails on some platforms.
-require 'rspec/core/formatters/base_formatter' # From test_result.rb
-
require 'buildr/core/util'
require 'buildr/core/common'
Modified: buildr/trunk/lib/buildr/java/test_result.rb
URL:
http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/java/test_result.rb?rev=1340602&r1=1340601&r2=1340602&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/java/test_result.rb (original)
+++ buildr/trunk/lib/buildr/java/test_result.rb Sun May 20 00:41:32 2012
@@ -13,6 +13,10 @@
# License for the specific language governing permissions and limitations under
# the License.
+# It is necessary to require these files here as the bdd plugin directly
includes this file
+require 'yaml'
+require 'rspec/core/formatters/base_formatter'
+
module Buildr #:nodoc:
module TestFramework
