You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@buildr.apache.org by to...@apache.org on 2010/08/24 17:21:34 UTC
svn commit: r988590 - in /buildr/trunk/spec: ./ core/ groovy/ ide/ java/
packaging/ scala/
Author: toulmean
Date: Tue Aug 24 15:21:33 2010
New Revision: 988590
URL: http://svn.apache.org/viewvc?rev=988590&view=rev
Log:
fixes for packaging as sources that was crashing the build, and changes of require to be able to run the tests with 1.9.2
Modified:
buildr/trunk/spec/core/application_spec.rb
buildr/trunk/spec/core/build_spec.rb
buildr/trunk/spec/core/cc_spec.rb
buildr/trunk/spec/core/checks_spec.rb
buildr/trunk/spec/core/common_spec.rb
buildr/trunk/spec/core/compile_spec.rb
buildr/trunk/spec/core/extension_spec.rb
buildr/trunk/spec/core/generate_spec.rb
buildr/trunk/spec/core/project_spec.rb
buildr/trunk/spec/core/test_spec.rb
buildr/trunk/spec/core/transport_spec.rb
buildr/trunk/spec/core/util_spec.rb
buildr/trunk/spec/groovy/bdd_spec.rb
buildr/trunk/spec/groovy/compiler_spec.rb
buildr/trunk/spec/ide/eclipse_spec.rb
buildr/trunk/spec/ide/idea7x_spec.rb
buildr/trunk/spec/java/ant_spec.rb
buildr/trunk/spec/java/bdd_spec.rb
buildr/trunk/spec/java/cobertura_spec.rb
buildr/trunk/spec/java/commands_spec.rb
buildr/trunk/spec/java/compiler_spec.rb
buildr/trunk/spec/java/ecj_spec.rb
buildr/trunk/spec/java/emma_spec.rb
buildr/trunk/spec/java/external_spec.rb
buildr/trunk/spec/java/java_spec.rb
buildr/trunk/spec/java/packaging_spec.rb
buildr/trunk/spec/java/test_coverage_helper.rb
buildr/trunk/spec/java/tests_spec.rb
buildr/trunk/spec/packaging/archive_spec.rb
buildr/trunk/spec/packaging/artifact_namespace_spec.rb
buildr/trunk/spec/packaging/artifact_spec.rb
buildr/trunk/spec/packaging/packaging_spec.rb
buildr/trunk/spec/scala/bdd_spec.rb
buildr/trunk/spec/scala/compiler_spec.rb
buildr/trunk/spec/scala/scala.rb
buildr/trunk/spec/scala/tests_spec.rb
buildr/trunk/spec/version_requirement_spec.rb
Modified: buildr/trunk/spec/core/application_spec.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/spec/core/application_spec.rb?rev=988590&r1=988589&r2=988590&view=diff
==============================================================================
--- buildr/trunk/spec/core/application_spec.rb (original)
+++ buildr/trunk/spec/core/application_spec.rb Tue Aug 24 15:21:33 2010
@@ -14,7 +14,7 @@
# the License.
-require File.join(File.dirname(__FILE__), '../spec_helpers')
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helpers'))
describe Buildr::Application do
Modified: buildr/trunk/spec/core/build_spec.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/spec/core/build_spec.rb?rev=988590&r1=988589&r2=988590&view=diff
==============================================================================
--- buildr/trunk/spec/core/build_spec.rb (original)
+++ buildr/trunk/spec/core/build_spec.rb Tue Aug 24 15:21:33 2010
@@ -14,8 +14,7 @@
# the License.
-require File.join(File.dirname(__FILE__), '../spec_helpers')
-
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helpers'))
describe 'local task', :shared=>true do
it "should execute task for project in current directory" do
Modified: buildr/trunk/spec/core/cc_spec.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/spec/core/cc_spec.rb?rev=988590&r1=988589&r2=988590&view=diff
==============================================================================
--- buildr/trunk/spec/core/cc_spec.rb (original)
+++ buildr/trunk/spec/core/cc_spec.rb Tue Aug 24 15:21:33 2010
@@ -14,7 +14,7 @@
# the License.
-require File.join(File.dirname(__FILE__), '../spec_helpers')
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helpers'))
module CCHelper
def setup_cc
Modified: buildr/trunk/spec/core/checks_spec.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/spec/core/checks_spec.rb?rev=988590&r1=988589&r2=988590&view=diff
==============================================================================
--- buildr/trunk/spec/core/checks_spec.rb (original)
+++ buildr/trunk/spec/core/checks_spec.rb Tue Aug 24 15:21:33 2010
@@ -14,7 +14,7 @@
# the License.
-require File.join(File.dirname(__FILE__), '../spec_helpers')
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helpers'))
describe Project, 'check task' do
Modified: buildr/trunk/spec/core/common_spec.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/spec/core/common_spec.rb?rev=988590&r1=988589&r2=988590&view=diff
==============================================================================
--- buildr/trunk/spec/core/common_spec.rb (original)
+++ buildr/trunk/spec/core/common_spec.rb Tue Aug 24 15:21:33 2010
@@ -14,7 +14,7 @@
# the License.
-require File.join(File.dirname(__FILE__), '../spec_helpers')
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helpers'))
describe Buildr.method(:struct) do
before do
Modified: buildr/trunk/spec/core/compile_spec.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/spec/core/compile_spec.rb?rev=988590&r1=988589&r2=988590&view=diff
==============================================================================
--- buildr/trunk/spec/core/compile_spec.rb (original)
+++ buildr/trunk/spec/core/compile_spec.rb Tue Aug 24 15:21:33 2010
@@ -14,7 +14,7 @@
# the License.
-require File.join(File.dirname(__FILE__), '../spec_helpers')
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helpers'))
module CompilerHelper
Modified: buildr/trunk/spec/core/extension_spec.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/spec/core/extension_spec.rb?rev=988590&r1=988589&r2=988590&view=diff
==============================================================================
--- buildr/trunk/spec/core/extension_spec.rb (original)
+++ buildr/trunk/spec/core/extension_spec.rb Tue Aug 24 15:21:33 2010
@@ -14,7 +14,7 @@
# the License.
-require File.join(File.dirname(__FILE__), '../spec_helpers')
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helpers'))
describe Extension do
Modified: buildr/trunk/spec/core/generate_spec.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/spec/core/generate_spec.rb?rev=988590&r1=988589&r2=988590&view=diff
==============================================================================
--- buildr/trunk/spec/core/generate_spec.rb (original)
+++ buildr/trunk/spec/core/generate_spec.rb Tue Aug 24 15:21:33 2010
@@ -14,7 +14,7 @@
# the License.
-require File.join(File.dirname(__FILE__), '../spec_helpers')
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helpers'))
describe Buildr::Generate do
Modified: buildr/trunk/spec/core/project_spec.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/spec/core/project_spec.rb?rev=988590&r1=988589&r2=988590&view=diff
==============================================================================
--- buildr/trunk/spec/core/project_spec.rb (original)
+++ buildr/trunk/spec/core/project_spec.rb Tue Aug 24 15:21:33 2010
@@ -14,7 +14,7 @@
# the License.
-require File.join(File.dirname(__FILE__), '../spec_helpers')
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helpers'))
describe Project do
Modified: buildr/trunk/spec/core/test_spec.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/spec/core/test_spec.rb?rev=988590&r1=988589&r2=988590&view=diff
==============================================================================
--- buildr/trunk/spec/core/test_spec.rb (original)
+++ buildr/trunk/spec/core/test_spec.rb Tue Aug 24 15:21:33 2010
@@ -14,7 +14,7 @@
# the License.
-require File.join(File.dirname(__FILE__), '../spec_helpers')
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helpers'))
module TestHelper
Modified: buildr/trunk/spec/core/transport_spec.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/spec/core/transport_spec.rb?rev=988590&r1=988589&r2=988590&view=diff
==============================================================================
--- buildr/trunk/spec/core/transport_spec.rb (original)
+++ buildr/trunk/spec/core/transport_spec.rb Tue Aug 24 15:21:33 2010
@@ -14,7 +14,7 @@
# the License.
-require File.join(File.dirname(__FILE__), '../spec_helpers')
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helpers'))
describe URI, '#download' do
Modified: buildr/trunk/spec/core/util_spec.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/spec/core/util_spec.rb?rev=988590&r1=988589&r2=988590&view=diff
==============================================================================
--- buildr/trunk/spec/core/util_spec.rb (original)
+++ buildr/trunk/spec/core/util_spec.rb Tue Aug 24 15:21:33 2010
@@ -14,7 +14,7 @@
# the License.
-require File.join(File.dirname(__FILE__), '../spec_helpers')
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helpers'))
describe Buildr do
describe "#replace_extension" do
Modified: buildr/trunk/spec/groovy/bdd_spec.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/spec/groovy/bdd_spec.rb?rev=988590&r1=988589&r2=988590&view=diff
==============================================================================
--- buildr/trunk/spec/groovy/bdd_spec.rb (original)
+++ buildr/trunk/spec/groovy/bdd_spec.rb Tue Aug 24 15:21:33 2010
@@ -13,7 +13,7 @@
# License for the specific language governing permissions and limitations under
# the License.
-require File.join(File.dirname(__FILE__), '../spec_helpers')
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helpers'))
describe Buildr::Groovy::EasyB do
Modified: buildr/trunk/spec/groovy/compiler_spec.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/spec/groovy/compiler_spec.rb?rev=988590&r1=988589&r2=988590&view=diff
==============================================================================
--- buildr/trunk/spec/groovy/compiler_spec.rb (original)
+++ buildr/trunk/spec/groovy/compiler_spec.rb Tue Aug 24 15:21:33 2010
@@ -14,7 +14,7 @@
# the License.
-require File.join(File.dirname(__FILE__), '../spec_helpers')
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helpers'))
describe 'groovyc compiler' do
Modified: buildr/trunk/spec/ide/eclipse_spec.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/spec/ide/eclipse_spec.rb?rev=988590&r1=988589&r2=988590&view=diff
==============================================================================
--- buildr/trunk/spec/ide/eclipse_spec.rb (original)
+++ buildr/trunk/spec/ide/eclipse_spec.rb Tue Aug 24 15:21:33 2010
@@ -14,7 +14,7 @@
# the License.
-require File.join(File.dirname(__FILE__), '../spec_helpers')
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helpers'))
JAVA_CONTAINER = Buildr::Eclipse::Java::CONTAINER
Modified: buildr/trunk/spec/ide/idea7x_spec.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/spec/ide/idea7x_spec.rb?rev=988590&r1=988589&r2=988590&view=diff
==============================================================================
--- buildr/trunk/spec/ide/idea7x_spec.rb (original)
+++ buildr/trunk/spec/ide/idea7x_spec.rb Tue Aug 24 15:21:33 2010
@@ -14,7 +14,7 @@
# the License.
-require File.join(File.dirname(__FILE__), '../spec_helpers')
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helpers'))
module Idea7xHelper
Modified: buildr/trunk/spec/java/ant_spec.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/spec/java/ant_spec.rb?rev=988590&r1=988589&r2=988590&view=diff
==============================================================================
--- buildr/trunk/spec/java/ant_spec.rb (original)
+++ buildr/trunk/spec/java/ant_spec.rb Tue Aug 24 15:21:33 2010
@@ -14,7 +14,7 @@
# the License.
-require File.join(File.dirname(__FILE__), '../spec_helpers')
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helpers'))
describe Buildr::Ant do
Modified: buildr/trunk/spec/java/bdd_spec.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/spec/java/bdd_spec.rb?rev=988590&r1=988589&r2=988590&view=diff
==============================================================================
--- buildr/trunk/spec/java/bdd_spec.rb (original)
+++ buildr/trunk/spec/java/bdd_spec.rb Tue Aug 24 15:21:33 2010
@@ -13,7 +13,7 @@
# License for the specific language governing permissions and limitations under
# the License.
-require File.join(File.dirname(__FILE__), '../spec_helpers')
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helpers'))
describe Buildr::RSpec do
Modified: buildr/trunk/spec/java/cobertura_spec.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/spec/java/cobertura_spec.rb?rev=988590&r1=988589&r2=988590&view=diff
==============================================================================
--- buildr/trunk/spec/java/cobertura_spec.rb (original)
+++ buildr/trunk/spec/java/cobertura_spec.rb Tue Aug 24 15:21:33 2010
@@ -14,7 +14,7 @@
# the License.
-require File.join(File.dirname(__FILE__), 'test_coverage_helper')
+require File.expand_path(File.join(File.dirname(__FILE__), 'test_coverage_helper'))
Sandbox.require_optional_extension 'buildr/java/cobertura'
artifacts(Buildr::Cobertura::dependencies).map(&:invoke)
Modified: buildr/trunk/spec/java/commands_spec.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/spec/java/commands_spec.rb?rev=988590&r1=988589&r2=988590&view=diff
==============================================================================
--- buildr/trunk/spec/java/commands_spec.rb (original)
+++ buildr/trunk/spec/java/commands_spec.rb Tue Aug 24 15:21:33 2010
@@ -13,7 +13,7 @@
# License for the specific language governing permissions and limitations under
# the License.
-require File.join(File.dirname(__FILE__), '../spec_helpers')
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helpers'))
describe Java::Commands do
Modified: buildr/trunk/spec/java/compiler_spec.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/spec/java/compiler_spec.rb?rev=988590&r1=988589&r2=988590&view=diff
==============================================================================
--- buildr/trunk/spec/java/compiler_spec.rb (original)
+++ buildr/trunk/spec/java/compiler_spec.rb Tue Aug 24 15:21:33 2010
@@ -14,7 +14,7 @@
# the License.
-require File.join(File.dirname(__FILE__), '../spec_helpers')
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helpers'))
describe 'javac compiler' do
Modified: buildr/trunk/spec/java/ecj_spec.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/spec/java/ecj_spec.rb?rev=988590&r1=988589&r2=988590&view=diff
==============================================================================
--- buildr/trunk/spec/java/ecj_spec.rb (original)
+++ buildr/trunk/spec/java/ecj_spec.rb Tue Aug 24 15:21:33 2010
@@ -13,7 +13,7 @@
# License for the specific language governing permissions and limitations under
# the License.
-require File.join(File.dirname(__FILE__), '../spec_helpers')
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helpers'))
@@ -50,7 +50,7 @@ describe Buildr::Compiler::Ecj do
describe "should compile a Java project just in the same way javac does" do
javac_spec = File.read(File.join(File.dirname(__FILE__), "compiler_spec.rb"))
- javac_spec = javac_spec.match(Regexp.escape("require File.join(File.dirname(__FILE__), '../spec_helpers')\n")).post_match
+ javac_spec = javac_spec.match(Regexp.escape("require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helpers'))\n")).post_match
javac_spec.gsub!("javac", "ecj")
javac_spec.gsub!("nowarn", "warn:none")
eval(javac_spec)
Modified: buildr/trunk/spec/java/emma_spec.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/spec/java/emma_spec.rb?rev=988590&r1=988589&r2=988590&view=diff
==============================================================================
--- buildr/trunk/spec/java/emma_spec.rb (original)
+++ buildr/trunk/spec/java/emma_spec.rb Tue Aug 24 15:21:33 2010
@@ -14,7 +14,7 @@
# the License.
-require File.join(File.dirname(__FILE__), 'test_coverage_helper')
+require File.expand_path(File.join(File.dirname(__FILE__), 'test_coverage_helper'))
Sandbox.require_optional_extension 'buildr/java/emma'
artifacts(Buildr::Emma::dependencies).map(&:invoke)
Modified: buildr/trunk/spec/java/external_spec.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/spec/java/external_spec.rb?rev=988590&r1=988589&r2=988590&view=diff
==============================================================================
--- buildr/trunk/spec/java/external_spec.rb (original)
+++ buildr/trunk/spec/java/external_spec.rb Tue Aug 24 15:21:33 2010
@@ -14,7 +14,7 @@
# the License.
-require File.join(File.dirname(__FILE__), '../spec_helpers')
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helpers'))
COMPILERS = Buildr::Compiler.compilers.dup
COMPILERS_WITHOUT_JAVAC = COMPILERS.dup
@@ -28,7 +28,7 @@ describe Buildr::Compiler::ExternalJavac
describe "should compile a Java project just in the same way javac does" do
javac_spec = File.read(File.join(File.dirname(__FILE__), "compiler_spec.rb"))
- javac_spec = javac_spec.match(Regexp.escape("require File.join(File.dirname(__FILE__), '../spec_helpers')\n")).post_match
+ javac_spec = javac_spec.match(Regexp.escape("require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helpers'))\n")).post_match
javac_spec.gsub!("javac", "externaljavac")
eval(javac_spec)
end
Modified: buildr/trunk/spec/java/java_spec.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/spec/java/java_spec.rb?rev=988590&r1=988589&r2=988590&view=diff
==============================================================================
--- buildr/trunk/spec/java/java_spec.rb (original)
+++ buildr/trunk/spec/java/java_spec.rb Tue Aug 24 15:21:33 2010
@@ -14,7 +14,7 @@
# the License.
-require File.join(File.dirname(__FILE__), '../spec_helpers')
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helpers'))
unless RUBY_PLATFORM =~ /java/
@@ -52,7 +52,7 @@ else
end
-describe Java, '#tools_jar' do
+describe 'Java.tools_jar' do
before do
@old_home = ENV['JAVA_HOME']
end
@@ -63,7 +63,7 @@ describe Java, '#tools_jar' do
write 'jdk/lib/tools.jar'
ENV['JAVA_HOME'] = File.expand_path('jdk')
end
-
+
it 'should return the path to tools.jar' do
Java.tools_jar.should point_to_path('jdk/lib/tools.jar')
end
@@ -75,7 +75,7 @@ describe Java, '#tools_jar' do
write 'jdk/lib/tools.jar'
ENV['JAVA_HOME'] = File.expand_path('jdk/jre')
end
-
+
it 'should return the path to tools.jar' do
Java.tools_jar.should point_to_path('jdk/lib/tools.jar')
end
@@ -86,7 +86,7 @@ describe Java, '#tools_jar' do
Java.instance_eval { @tools_jar = nil }
ENV['JAVA_HOME'] = File.expand_path('jdk')
end
-
+
it 'should return nil' do
Java.tools_jar.should be_nil
end
Modified: buildr/trunk/spec/java/packaging_spec.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/spec/java/packaging_spec.rb?rev=988590&r1=988589&r2=988590&view=diff
==============================================================================
--- buildr/trunk/spec/java/packaging_spec.rb (original)
+++ buildr/trunk/spec/java/packaging_spec.rb Tue Aug 24 15:21:33 2010
@@ -14,8 +14,8 @@
# the License.
-require File.join(File.dirname(__FILE__), '../spec_helpers')
-require File.join(File.dirname(__FILE__), '../packaging/packaging_helper')
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helpers'))
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'packaging', 'packaging_helper'))
describe Project, '#manifest' do
@@ -1076,13 +1076,13 @@ end
describe Packaging, 'sources' do
it_should_behave_like 'packaging'
- before { @packaging, @package_type = :sources, :zip }
+ before { @packaging, @package_type = :sources, :jar }
- it 'should create package of type :zip and classifier \'sources\'' do
+ it 'should create package of type :jar and classifier \'sources\'' do
define 'foo', :version=>'1.0' do
- package(:sources).type.should eql(:zip)
+ package(:sources).type.should eql(:jar)
package(:sources).classifier.should eql('sources')
- package(:sources).name.should match(/foo-1.0-sources.zip$/)
+ package(:sources).name.should match(/foo-1.0-sources.jar$/)
end
end
@@ -1152,9 +1152,11 @@ shared_examples_for 'package_with_' do
projects.select { |project| project.packages.first }.map(&:name)
end
- it 'should create package of type zip with classifier' do
+ it 'should create package of the right packaging with classifier' do
prepare
- project('foo').packages.first.to_s.should =~ /foo-1.0-#{@packaging}.zip/
+ ext = "zip"
+ ext = "jar" if @packaging == :sources
+ project('foo').packages.first.to_s.should =~ /foo-1.0-#{@packaging}.#{ext}/
end
it 'should create package for projects that have source files' do
Modified: buildr/trunk/spec/java/test_coverage_helper.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/spec/java/test_coverage_helper.rb?rev=988590&r1=988589&r2=988590&view=diff
==============================================================================
--- buildr/trunk/spec/java/test_coverage_helper.rb (original)
+++ buildr/trunk/spec/java/test_coverage_helper.rb Tue Aug 24 15:21:33 2010
@@ -14,7 +14,7 @@
# the License.
-require File.join(File.dirname(__FILE__), '../spec_helpers')
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helpers'))
module TestCoverageHelper
Modified: buildr/trunk/spec/java/tests_spec.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/spec/java/tests_spec.rb?rev=988590&r1=988589&r2=988590&view=diff
==============================================================================
--- buildr/trunk/spec/java/tests_spec.rb (original)
+++ buildr/trunk/spec/java/tests_spec.rb Tue Aug 24 15:21:33 2010
@@ -14,7 +14,7 @@
# the License.
-require File.join(File.dirname(__FILE__), '../spec_helpers')
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helpers'))
describe Buildr::JUnit do
Modified: buildr/trunk/spec/packaging/archive_spec.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/spec/packaging/archive_spec.rb?rev=988590&r1=988589&r2=988590&view=diff
==============================================================================
--- buildr/trunk/spec/packaging/archive_spec.rb (original)
+++ buildr/trunk/spec/packaging/archive_spec.rb Tue Aug 24 15:21:33 2010
@@ -14,7 +14,7 @@
# the License.
-require File.join(File.dirname(__FILE__), '../spec_helpers')
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helpers'))
describe 'ArchiveTask', :shared=>true do
Modified: buildr/trunk/spec/packaging/artifact_namespace_spec.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/spec/packaging/artifact_namespace_spec.rb?rev=988590&r1=988589&r2=988590&view=diff
==============================================================================
--- buildr/trunk/spec/packaging/artifact_namespace_spec.rb (original)
+++ buildr/trunk/spec/packaging/artifact_namespace_spec.rb Tue Aug 24 15:21:33 2010
@@ -13,7 +13,7 @@
# License for the specific language governing permissions and limitations under
# the License.
-require File.join(File.dirname(__FILE__), '../spec_helpers')
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helpers'))
describe Buildr::ArtifactNamespace do
Modified: buildr/trunk/spec/packaging/artifact_spec.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/spec/packaging/artifact_spec.rb?rev=988590&r1=988589&r2=988590&view=diff
==============================================================================
--- buildr/trunk/spec/packaging/artifact_spec.rb (original)
+++ buildr/trunk/spec/packaging/artifact_spec.rb Tue Aug 24 15:21:33 2010
@@ -14,7 +14,7 @@
# the License.
-require File.join(File.dirname(__FILE__), '../spec_helpers')
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helpers'))
describe Artifact do
Modified: buildr/trunk/spec/packaging/packaging_spec.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/spec/packaging/packaging_spec.rb?rev=988590&r1=988589&r2=988590&view=diff
==============================================================================
--- buildr/trunk/spec/packaging/packaging_spec.rb (original)
+++ buildr/trunk/spec/packaging/packaging_spec.rb Tue Aug 24 15:21:33 2010
@@ -14,8 +14,8 @@
# the License.
-require File.join(File.dirname(__FILE__), '../spec_helpers')
-require File.join(File.dirname(__FILE__), 'packaging_helper')
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helpers'))
+require File.expand_path(File.join(File.dirname(__FILE__), 'packaging_helper'))
describe Project, '#group' do
Modified: buildr/trunk/spec/scala/bdd_spec.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/spec/scala/bdd_spec.rb?rev=988590&r1=988589&r2=988590&view=diff
==============================================================================
--- buildr/trunk/spec/scala/bdd_spec.rb (original)
+++ buildr/trunk/spec/scala/bdd_spec.rb Tue Aug 24 15:21:33 2010
@@ -14,7 +14,7 @@
# the License.
-require File.join(File.dirname(__FILE__), '../spec_helpers')
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helpers'))
describe Buildr::Scala::Specs do
Modified: buildr/trunk/spec/scala/compiler_spec.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/spec/scala/compiler_spec.rb?rev=988590&r1=988589&r2=988590&view=diff
==============================================================================
--- buildr/trunk/spec/scala/compiler_spec.rb (original)
+++ buildr/trunk/spec/scala/compiler_spec.rb Tue Aug 24 15:21:33 2010
@@ -14,7 +14,7 @@
# the License.
-require File.join(File.dirname(__FILE__), '../spec_helpers')
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helpers'))
# need to test both with and without SCALA_HOME
share_as :ScalacCompiler do
Modified: buildr/trunk/spec/scala/scala.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/spec/scala/scala.rb?rev=988590&r1=988589&r2=988590&view=diff
==============================================================================
--- buildr/trunk/spec/scala/scala.rb (original)
+++ buildr/trunk/spec/scala/scala.rb Tue Aug 24 15:21:33 2010
@@ -14,7 +14,7 @@
# the License.
-require File.join(File.dirname(__FILE__), '../spec_helpers')
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helpers'))
describe 'scala' do
# Specific version of Scala required for specs
Modified: buildr/trunk/spec/scala/tests_spec.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/spec/scala/tests_spec.rb?rev=988590&r1=988589&r2=988590&view=diff
==============================================================================
--- buildr/trunk/spec/scala/tests_spec.rb (original)
+++ buildr/trunk/spec/scala/tests_spec.rb Tue Aug 24 15:21:33 2010
@@ -14,7 +14,7 @@
# the License.
-require File.join(File.dirname(__FILE__), '../spec_helpers')
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helpers'))
# TODO's
# -test passing System props
Modified: buildr/trunk/spec/version_requirement_spec.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/spec/version_requirement_spec.rb?rev=988590&r1=988589&r2=988590&view=diff
==============================================================================
--- buildr/trunk/spec/version_requirement_spec.rb (original)
+++ buildr/trunk/spec/version_requirement_spec.rb Tue Aug 24 15:21:33 2010
@@ -14,7 +14,7 @@
# the License.
-require File.join(File.dirname(__FILE__), 'spec_helpers')
+require File.expand_path(File.join(File.dirname(__FILE__), 'spec_helpers'))
describe Buildr::VersionRequirement, '.create' do
def create(str)