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: eef3f728c6b7
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: dbde0d59b036
Choose a head ref
  • 3 commits
  • 2 files changed
  • 1 contributor

Commits on Jun 22, 2017

  1. [travis-ci] further set/decrease overall JVM memory max

    @kares
    kares committed Jun 22, 2017
    Copy the full SHA
    5089401 View commit details

  2. [travis-ci] export JAVA_OPTS based on JVM version (set MaxPerm/Meta)

    @kares
    kares committed Jun 22, 2017
    Copy the full SHA
    eeaaebf View commit details

  3. [test] un-exclude working TestSymbol#test_symbol_fstr_leak

    @kares
    kares committed Jun 22, 2017
    Copy the full SHA
    dbde0d5 View commit details
Showing with 5 additions and 4 deletions.
  1. +4 −3 .travis.yml
  2. +1 −1 test/mri/excludes/TestSymbol.rb
7 changes: 4 additions & 3 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -9,8 +9,9 @@ cache:
before_install:
- rm ~/.m2/settings.xml
- export MAVEN_SKIP_RC=true
- mvn -Xmx32M -v | grep 1.7.0; if [ $? = 0 ]; then export MAVEN_OPTS="-XX:MaxPermSize=180M"; else export MAVEN_OPTS="-XX:MaxMetaspaceSize=180M -XX:CompressedClassSpaceSize=180M"; fi
- export MAVEN_OPTS="-Xmx500M $MAVEN_OPTS"
- mvn -Xmx32M -v | grep 1.7.0; if [ $? = 0 ]; then export MAVEN_OPTS="-XX:MaxPermSize=120M"; else export MAVEN_OPTS="-XX:CompressedClassSpaceSize=96M -XX:MaxMetaspaceSize=120M"; fi
- export MAVEN_OPTS="-Xmn52M -Xmx504M $MAVEN_OPTS"
- mvn -Xmx32M -v | grep 1.7.0; if [ $? = 0 ]; then export JAVA_OPTS="$JAVA_OPTS -XX:MaxPermSize=96M"; else export JAVA_OPTS="$JAVA_OPTS -XX:CompressedClassSpaceSize=72M -XX:MaxMetaspaceSize=96M"; fi

before_script:
- unset GEM_PATH GEM_HOME IRBRC JRUBY_OPTS
@@ -28,7 +29,7 @@ os:

env:
global:
- JAVA_OPTS="-XX:+TieredCompilation -XX:TieredStopAtLevel=1 -Xmn36M -Xmx1G -Djava.security.egd=file:/dev/./urandom"
- JAVA_OPTS="-XX:+TieredCompilation -XX:TieredStopAtLevel=1 -Xmn36M -Xmx768M -XX:InitialCodeCacheSize=40M -XX:ReservedCodeCacheSize=120M -Djava.security.egd=file:/dev/./urandom"
- MALLOC_ARENA_MAX=2
matrix:
- PHASE='-Ptest'
2 changes: 1 addition & 1 deletion test/mri/excludes/TestSymbol.rb
View file
Original file line number Diff line number Diff line change
@@ -4,4 +4,4 @@
exclude :test_to_proc_binding, "needs investigation #4303"
exclude :test_to_proc_iseq, "needs investigation #4303"
exclude :test_symbol_encoding, "needs investigation"
exclude :test_symbol_fstr_leak, "assert_no_memory_leak fails due an unexpected nil"
#exclude :test_symbol_fstr_leak, "works but Test::Unit's assert_no_memory_leak spawns a sub-Ruby"