diff options
| -rw-r--r-- | .travis.yml | 17 | ||||
| -rw-r--r-- | mrbgems/mruby-io/src/file.c | 1 |
2 files changed, 6 insertions, 12 deletions
diff --git a/.travis.yml b/.travis.yml index d9e2fa50a..56c54914a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,27 +1,20 @@ language: c +sudo: false + matrix: include: - os: linux - sudo: false - dist: trusty + sudo: 9000 - os: osx + osx_image: xcode7.1 addons: apt: - sources: - - ubuntu-toolchain-r-test packages: - gperf - - gcc-6 - - g++-6 env: MRUBY_CONFIG=travis_config.rb -before_install: - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; brew install gcc@6 || breq link --overwrite gcc@6 ; fi - - export CC=gcc-6 - - export CXX=g++-6 - - export LD=gcc-6 - - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export LDFLAGS="-fuse-ld=gold" ; fi +env: MRUBY_CONFIG=travis_config.rb script: "./minirake all test" diff --git a/mrbgems/mruby-io/src/file.c b/mrbgems/mruby-io/src/file.c index 11b05d31c..bcfd42408 100644 --- a/mrbgems/mruby-io/src/file.c +++ b/mrbgems/mruby-io/src/file.c @@ -214,6 +214,7 @@ mrb_file_basename(mrb_state *mrb, mrb_value klass) if ((bname = basename(path)) == NULL) { mrb_sys_fail(mrb, "basename"); } + if (strncmp(bname, "//", 3) == 0) bname[1] = '\0'; /* patch for Cygwin */ return mrb_str_new_cstr(mrb, bname); #endif } |