svn commit: r1389116 - in /buildr/trunk/spec/scala: compiler_spec.rb doc_spec.rb

[do...@apache.org]

Author: donaldp
Date: Sun Sep 23 18:57:51 2012
New Revision: 1389116

URL: http://svn.apache.org/viewvc?rev=1389116&view=rev
Log:
Disable some tests in jdk 1.5

Modified:
    buildr/trunk/spec/scala/compiler_spec.rb
    buildr/trunk/spec/scala/doc_spec.rb

Modified: buildr/trunk/spec/scala/compiler_spec.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/spec/scala/compiler_spec.rb?rev=1389116&r1=1389115&r2=1389116&view=diff
==============================================================================
--- buildr/trunk/spec/scala/compiler_spec.rb (original)
+++ buildr/trunk/spec/scala/compiler_spec.rb Sun Sep 23 18:57:51 2012
@@ -319,6 +319,8 @@ describe 'scala compiler 2.9 options' do
 
 end if Buildr::Scala.version?(2.9)
 
+if Java.java.lang.System.getProperty("java.runtime.version") >= "1.6"
+
 describe 'zinc compiler (enabled through Buildr.settings)' do
   before :each do
     Buildr.settings.build['scalac.incremental'] = true
@@ -355,3 +357,6 @@ describe 'zinc compiler (enabled through
   end
 end
 
+elsif Buildr::VERSION >= '1.5'
+  raise "JVM version guard in #{__FILE__} should be removed since it is assumed that Java 1.5 is no longer supported."
+end

Modified: buildr/trunk/spec/scala/doc_spec.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/spec/scala/doc_spec.rb?rev=1389116&r1=1389115&r2=1389116&view=diff
==============================================================================
--- buildr/trunk/spec/scala/doc_spec.rb (original)
+++ buildr/trunk/spec/scala/doc_spec.rb Sun Sep 23 18:57:51 2012
@@ -47,6 +47,8 @@ describe "Scaladoc" do
     project('foo').doc.options[:"doc-title"].should eql('explicit')
   end
 
+if Java.java.lang.System.getProperty("java.runtime.version") >= "1.6"
+
   it 'should convert :windowtitle to -doc-title for Scala 2.8.1 and later' do
     write 'src/main/scala/com/example/Test.scala', 'package com.example; class Test { val i = 1 }'
     define('foo') do
@@ -66,8 +68,15 @@ describe "Scaladoc" do
     end
     project('foo').doc.invoke
   end unless Buildr::Scala.version?(2.7, "2.8.0")
+
+elsif Buildr::VERSION >= '1.5'
+  raise "JVM version guard in #{__FILE__} should be removed since it is assumed that Java 1.5 is no longer supported."
+end
+
 end
 
+if Java.java.lang.System.getProperty("java.runtime.version") >= "1.6"
+
 describe "package(:scaladoc)" do
   it "should generate target/project-version-scaladoc.jar" do
     write 'src/main/scala/Foo.scala', 'class Foo'
@@ -88,3 +97,6 @@ describe "package(:scaladoc)" do
   end
 end
 
+elsif Buildr::VERSION >= '1.5'
+  raise "JVM version guard in #{__FILE__} should be removed since it is assumed that Java 1.5 is no longer supported."
+end