Commit 8270aaa3 authored by Mislav Marohnić's avatar Mislav Marohnić
Browse files

Merge branch 'tmpdir-noexec'

parents 1173e8c0 00fcf8b5

bin/ruby-build

+5 −0
Original line number Diff line number Diff line
@@ -841,6 +841,11 @@ else 
  TMP="${TMPDIR%/}"

fi



if [ ! -w "$TMP" ] || [ ! -x "$TMP" ]; then

  echo "ruby-build: TMPDIR=$TMP is set to a non-accessible location" >&2

  exit 1

fi



# Work around warnings building Ruby 2.0 on Clang 2.x:

# pass -Wno-error=shorten-64-to-32 if the compiler accepts it.

#

test/build.bats

+20 −0
Original line number Diff line number Diff line
@@ -234,3 +234,23 @@ rubinius-2.0.0: --prefix=$INSTALL_ROOT 
bundle exec rake install

OUT

}



@test "non-writable TMPDIR aborts build" {

  export TMPDIR="${TMP}/build"

  mkdir -p "$TMPDIR"

  chmod -w "$TMPDIR"



  touch "${TMP}/build-definition"

  run ruby-build "${TMP}/build-definition" "$INSTALL_ROOT"

  assert_failure "ruby-build: TMPDIR=$TMPDIR is set to a non-accessible location"

}



@test "non-executable TMPDIR aborts build" {

  export TMPDIR="${TMP}/build"

  mkdir -p "$TMPDIR"

  chmod -x "$TMPDIR"



  touch "${TMP}/build-definition"

  run ruby-build "${TMP}/build-definition" "$INSTALL_ROOT"

  assert_failure "ruby-build: TMPDIR=$TMPDIR is set to a non-accessible location"

}