Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 9f2e566b3499^
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 8ad439686a87
Choose a head ref
  • 2 commits
  • 9 files changed
  • 1 contributor

Commits on Oct 9, 2014

  1. run tests/jruby.index with jruby-complete

    @mkristian
    mkristian committed Oct 9, 2014
    Copy the full SHA
    9f2e566 View commit details

  2. uniform setting path to jruby home - no detection just use the one fr… 

    …om the classloader
    @mkristian
    mkristian committed Oct 9, 2014
    Copy the full SHA
    8ad4396 View commit details
Showing with 182 additions and 9 deletions.
  1. +2 −0 .travis.yml
  2. +1 −1 core/src/main/java/org/jruby/RubyInstanceConfig.java
  3. +1 −3 core/src/main/java/org/jruby/embed/util/SystemPropertyCatcher.java
  4. +1 −1 maven/pom.rb
  5. +6 −0 maven/pom.xml
  6. +6 −4 pom.rb
  7. +10 −0 pom.xml
  8. +23 −0 test/pom.rb
  9. +132 −0 test/pom.xml
2 changes: 2 additions & 0 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -18,6 +18,7 @@ env:
- JAVA_OPTS="-XX:+TieredCompilation -XX:TieredStopAtLevel=1 -Djruby.cext.enabled=false"
matrix:
- TARGET='-Ptest'
- TARGET='-Pjars'
- TARGET='-Prake -Dtask=test:rubicon'
- TARGET='-Prake -Dtask=test:jruby'
- TARGET='-Prake -Dtask=test:mri'
@@ -48,6 +49,7 @@ matrix:
jdk: oraclejdk7
fast_finish: true
allow_failures:
- env: TARGET='-Pjars'
- env: TARGET='-Prake -Dtask=spec:compiler'

branches:
2 changes: 1 addition & 1 deletion core/src/main/java/org/jruby/RubyInstanceConfig.java
View file
Original file line number Diff line number Diff line change
@@ -302,7 +302,7 @@ private String calculateJRubyHome() {
newJRubyHome = verifyHome(newJRubyHome, error);
} else {
try {
newJRubyHome = SystemPropertyCatcher.findFromJar(this);
newJRubyHome = SystemPropertyCatcher.findJRubyHome(this);
} catch (Exception e) {}

if (newJRubyHome != null) {
4 changes: 1 addition & 3 deletions core/src/main/java/org/jruby/embed/util/SystemPropertyCatcher.java
View file
Original file line number Diff line number Diff line change
@@ -195,10 +195,8 @@ public static String findJRubyHome(Object instance) {
return jrubyhome;
} else if ((jrubyhome = SafePropertyAccessor.getProperty("jruby.home")) != null) {
return jrubyhome;
} else if ((jrubyhome = findFromJar(instance)) != null) {
return jrubyhome;
} else {
return null;
return "uri:classloader:/META-INF/jruby.home";
}
}

2 changes: 1 addition & 1 deletion maven/pom.rb
View file
Original file line number Diff line number Diff line change
@@ -26,7 +26,7 @@
map = { 'jruby' => [ :release, :main, :osgi, :j2ee ],
'jruby-noasm' => [ :release, :main, :osgi ],
'jruby-stdlib' => [ :release, :main, :complete, :dist, 'jruby-jars', :osgi, :j2ee ],
'jruby-complete' => [ :release, :complete, :osgi ],
'jruby-complete' => [ :release, :complete, :osgi, :'jars-test' ],
'jruby-jars' => [ :release, 'jruby-jars' ],
'jruby-dist' => [ :release, :dist ]
}
6 changes: 6 additions & 0 deletions maven/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -113,5 +113,11 @@
<module>jruby-jars</module>
</modules>
</profile>
<profile>
<id>jars-test</id>
<modules>
<module>jruby-complete</module>
</modules>
</profile>
</profiles>
</project>
10 changes: 6 additions & 4 deletions pom.rb
View file
Original file line number Diff line number Diff line change
@@ -210,12 +210,14 @@

all_modules = [ 'test', 'maven' ]

profile 'all' do
[ 'all', 'jars-test' ].each do |name|
profile name do

modules all_modules
modules all_modules

build do
default_goal 'install'
build do
default_goal 'install'
end
end
end

10 changes: 10 additions & 0 deletions pom.xml
View file
Original file line number Diff line number Diff line change
@@ -644,6 +644,16 @@
<module>maven</module>
</modules>
</profile>
<profile>
<id>jars-test</id>
<build>
<defaultGoal>install</defaultGoal>
</build>
<modules>
<module>test</module>
<module>maven</module>
</modules>
</profile>
<profile>
<id>clean</id>
<build>
23 changes: 23 additions & 0 deletions test/pom.rb
View file
Original file line number Diff line number Diff line change
@@ -136,6 +136,29 @@

end

profile 'jars-test' do

jar 'org.jruby:jruby-complete', '${project.version}', :scope => :provided

rake = Dir[File.join(basedir, "../lib/ruby/gems/shared/gems/rake-*/lib/rake/rake_test_loader.rb")].first
files = ""
File.open(File.join(basedir, 'jruby.index')) do |f|
f.each_line.each do |line|
filename = "test/#{line.chomp}.rb"
next unless File.exist? filename
files << "<arg value='#{filename}'/>"
end
end

plugin :antrun do
execute_goals( 'run',
:id => 'jars',
:phase => 'test',
:configuration => [ xml( "<target><exec dir='${jruby.home}' executable='java' failonerror='true'><arg value='-cp'/><arg value='core/target/test-classes:test/target/test-classes:maven/jruby-complete/target/jruby-complete-${project.version}.jar'/><arg value='org.jruby.Main'/><arg value='-I.'/><arg value='#{rake}'/>#{files}<arg value='-v'/></exec></target>" ) ] )
end

end

profile 'truffle-specs-language' do

plugin :antrun do
132 changes: 132 additions & 0 deletions test/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -273,6 +273,138 @@
</plugins>
</build>
</profile>
<profile>
<id>jars-test</id>
<build>
<plugins>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<id>jars</id>
<phase>test</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<target>
<exec dir="${jruby.home}" executable="java" failonerror="true">
<arg value="-cp" />
<arg value="core/target/test-classes:test/target/test-classes:maven/jruby-complete/target/jruby-complete-${project.version}.jar" />
<arg value="org.jruby.Main" />
<arg value="-I." />
<arg value="/home/christian/projects/active/maven/jruby/test/../lib/ruby/gems/shared/gems/rake-10.1.0/lib/rake/rake_test_loader.rb" />
<arg value="test/jruby/test_globals.rb" />
<arg value="test/jruby/test_argf.rb" />
<arg value="test/jruby/test_array.rb" />
<arg value="test/jruby/test_autoload.rb" />
<arg value="test/jruby/test_backquote.rb" />
<arg value="test/jruby/test_backtraces.rb" />
<arg value="test/jruby/test_big_decimal.rb" />
<arg value="test/jruby/test_binding_eval_yield.rb" />
<arg value="test/jruby/test_caller.rb" />
<arg value="test/jruby/test_case.rb" />
<arg value="test/jruby/test_class.rb" />
<arg value="test/jruby/test_comparable.rb" />
<arg value="test/jruby/test_core_arities.rb" />
<arg value="test/jruby/test_custom_enumerable.rb" />
<arg value="test/jruby/test_cvars_in_odd_scopes.rb" />
<arg value="test/jruby/test_date_joda_time.rb" />
<arg value="test/jruby/test_defined.rb" />
<arg value="test/jruby/test_default_constants.rb" />
<arg value="test/jruby/test_delegated_array_equals.rb" />
<arg value="test/jruby/test_dir.rb" />
<arg value="test/jruby/test_dir_with_jar_without_dir_entry.rb" />
<arg value="test/jruby/test_digest_extend.rb" />
<arg value="test/jruby/test_digest2.rb" />
<arg value="test/jruby/test_env.rb" />
<arg value="test/jruby/test_etc.rb" />
<arg value="test/jruby/test_file.rb" />
<arg value="test/jruby/test_flip.rb" />
<arg value="test/jruby/test_frame_self.rb" />
<arg value="test/jruby/test_hash.rb" />
<arg value="test/jruby/test_higher_javasupport.rb" />
<arg value="test/jruby/test_included_in_object_space.rb" />
<arg value="test/jruby/test_integer_overflows.rb" />
<arg value="test/jruby/test_ivar_table_integrity.rb" />
<arg value="test/jruby/test_io.rb" />
<arg value="test/jruby/test_load.rb" />
<arg value="test/jruby/test_method.rb" />
<arg value="test/jruby/test_method_cache.rb" />
<arg value="test/jruby/test_method_override_and_caching.rb" />
<arg value="test/jruby/test_java_accessible_object.rb" />
<arg value="test/jruby/test_java_extension.rb" />
<arg value="test/jruby/test_java_wrapper_deadlock.rb" />
<arg value="test/jruby/test_jruby_internals.rb" />
<arg value="test/jruby/test_marshal_with_instance_variables.rb" />
<arg value="test/jruby/test_marshal_gemspec.rb" />
<arg value="test/jruby/test_method_missing.rb" />
<arg value="test/jruby/test_no_stack_trace_stomp.rb" />
<arg value="test/jruby/test_pack.rb" />
<arg value="test/jruby/test_primitive_to_java.rb" />
<arg value="test/jruby/test_process.rb" />
<arg value="test/jruby/test_proc_visibility.rb" />
<arg value="test/jruby/test_parsing.rb" />
<arg value="test/jruby/test_pathname_dup.rb" />
<arg value="test/jruby/test_random.rb" />
<arg value="test/jruby/test_rbconfig.rb" />
<arg value="test/jruby/test_require_once.rb" />
<arg value="test/jruby/test_respond_to.rb" />
<arg value="test/jruby/test_socket.rb" />
<arg value="test/jruby/test_string_java_bytes.rb" />
<arg value="test/jruby/test_string_printf.rb" />
<arg value="test/jruby/test_string_to_number.rb" />
<arg value="test/jruby/test_super_call_site_caching.rb" />
<arg value="test/jruby/test_system.rb" />
<arg value="test/jruby/test_system_error.rb" />
<arg value="test/jruby/test_timeout.rb" />
<arg value="test/jruby/test_thread.rb" />
<arg value="test/jruby/test_threaded_nonlocal_return.rb" />
<arg value="test/jruby/test_time_add.rb" />
<arg value="test/jruby/test_time_nil_ops.rb" />
<arg value="test/jruby/test_time_tz.rb" />
<arg value="test/jruby/test_unmarshal.rb" />
<arg value="test/jruby/test_vietnamese_charset.rb" />
<arg value="test/jruby/test_win32.rb" />
<arg value="test/jruby/test_zlib.rb" />
<arg value="test/jruby/test_loading_builtin_libraries.rb" />
<arg value="test/jruby/test_null_channel.rb" />
<arg value="test/jruby/test_irubyobject_java_passing.rb" />
<arg value="test/jruby/test_jruby_object_input_stream.rb" />
<arg value="test/jruby/test_jar_on_load_path.rb" />
<arg value="test/jruby/test_jruby_ext.rb" />
<arg value="test/jruby/test_jruby_core_ext.rb" />
<arg value="test/jruby/test_thread_context_frame_dereferences_unreachable_variables.rb" />
<arg value="test/jruby/test_context_classloader.rb" />
<arg value="test/jruby/test_rexml_document.rb" />
<arg value="test/jruby/test_openssl_stub.rb" />
<arg value="test/jruby/test_missing_jruby_home.rb" />
<arg value="test/jruby/test_jarred_gems_with_spaces_in_directory.rb" />
<arg value="test/jruby/test_kernel.rb" />
<arg value="test/jruby/test_dir_with_plusses.rb" />
<arg value="test/jruby/test_jar_file.rb" />
<arg value="test/jruby/test_jruby_synchronized.rb" />
<arg value="test/jruby/test_instantiating_interfaces.rb" />
<arg value="test/jruby/test_openssl.rb" />
<arg value="test/jruby/test_tempfile_cleanup.rb" />
<arg value="-v" />
</exec>
</target>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>org.jruby</groupId>
<artifactId>jruby-complete</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>
</profile>
<profile>
<id>truffle-specs-language</id>
<build>