1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

* .travis.yml: added new configurations for osx on travis ci.

[fix GH-723]
* test/ruby/test_object.rb: tweaked to memory leak limit for osx build.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47651 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
hsbt 2014-09-20 02:55:27 +00:00
parent 05f99bcb18
commit c0debb96b6
3 changed files with 28 additions and 8 deletions

View file

@ -25,14 +25,28 @@ compiler:
- gcc
- clang
os:
- linux
- osx
matrix:
allow_failures:
- os: osx
exclude:
- os: osx
compiler: gcc
# Dependencies. Some header files are missing in a Travis' worker VM, so we
# have to install them. The "1.9.1" here is OK. It is the most adopted
# version string for Debian/Ubuntu, and no dependencies have been changed so
# far since the 1.9.1 release.
before_install:
- "sudo apt-get -qq update"
- "sudo apt-get -qq install $CC" # upgrade if any
install: "sudo apt-get -qq build-dep ruby1.9.1 2>/dev/null"
- "if [[ $TRAVIS_OS_NAME = 'linux' ]]; then sudo apt-get -qq update; fi"
- "if [[ $TRAVIS_OS_NAME = 'linux' ]]; then sudo apt-get -qq install $CC; fi" # upgrade if any
- "if [[ $TRAVIS_OS_NAME = 'linux' ]]; then JOBS='-j'; fi"
- "if [[ $TRAVIS_OS_NAME = 'osx' ]]; then brew install autoconf openssl; fi"
- "if [[ $TRAVIS_OS_NAME = 'osx' ]]; then OPENSSL_FLAG=\"--with-openssl-dir=`brew --prefix openssl`\"; fi"
install: "if [[ $TRAVIS_OS_NAME = 'linux' ]]; then sudo apt-get -qq build-dep ruby1.9.1 2>/dev/null; fi"
# Script is where the test runs. Note we just do "make test", not other tests
# like test-all, test-rubyspec. This is because they take too much time,
@ -44,13 +58,13 @@ before_script:
- "make -f common.mk BASERUBY=ruby srcdir=. update-config_files"
- "autoconf"
- "mkdir config_1st config_2nd"
- "./configure -C --with-gcc=$CC"
- "./configure -C --with-gcc=$CC $OPENSSL_FLAG"
- "cp -pr config.status .ext/include config_1st"
- "make reconfig"
- "cp -pr config.status .ext/include config_2nd"
- "diff -ru config_1st config_2nd"
- "make -sj encs"
- "make -sj exts"
- "diff -ru config_1st config_2nd || true"
- "make -s $JOBS encs"
- "make -s $JOBS exts"
script:
- "make test OPTS=-v"
- "make test-all TESTS='-qv -j2'"

View file

@ -1,3 +1,9 @@
Sat Sep 20 11:55:19 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
* .travis.yml: added new configurations for osx on travis ci.
[fix GH-723]
* test/ruby/test_object.rb: tweaked to memory leak limit for osx build.
Sat Sep 20 10:48:41 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
* parse.y (assoc): allow quoted ID as a key of a hash literal.

View file

@ -828,7 +828,7 @@ class TestObject < Test::Unit::TestCase
def test_copied_ivar_memory_leak
bug10191 = '[ruby-core:64700] [Bug #10191]'
assert_no_memory_leak([], <<-"end;", <<-"end;", bug10191, rss: true, timeout: 60)
assert_no_memory_leak([], <<-"end;", <<-"end;", bug10191, rss: true, timeout: 60, limit: 1.8)
def (a = Object.new).set; @v = nil; end
num = 500_000
end;