Commit 37c9a046 authored by Eric Lindvall's avatar Eric Lindvall
Browse files

Add test for MAKE_INSTALL_OPTS 

Also fix the ordering of make install arguments
parent 93828a2d

bin/ruby-build

+1 −1
Original line number Diff line number Diff line
@@ -411,7 +411,7 @@ build_package_standard() { 
  ) >&4 2>&1



  { "$MAKE" $MAKE_OPTS ${!PACKAGE_MAKE_OPTS} "${!PACKAGE_MAKE_OPTS_ARRAY}"

    "$MAKE" $MAKE_INSTALL_OPTS install ${!PACKAGE_MAKE_INSTALL_OPTS} "${!PACKAGE_MAKE_INSTALL_OPTS_ARRAY}"

    "$MAKE" install $MAKE_INSTALL_OPTS ${!PACKAGE_MAKE_INSTALL_OPTS} "${!PACKAGE_MAKE_INSTALL_OPTS_ARRAY}"

  } >&4 2>&1

}

test/build.bats

+20 −0
Original line number Diff line number Diff line
@@ -239,6 +239,26 @@ make install DOGE="such wow" 
OUT

}



@test "setting MAKE_INSTALL_OPTS to a multi-word string" {

  cached_tarball "ruby-2.0.0"



  stub_make_install



  export MAKE_INSTALL_OPTS="DOGE=\"such wow\""

  run_inline_definition <<DEF

install_package "ruby-2.0.0" "http://ruby-lang.org/ruby/2.0/ruby-2.0.0.tar.gz"

DEF

  assert_success



  unstub make



  assert_build_log <<OUT

ruby-2.0.0: --prefix=$INSTALL_ROOT

make -j 2

make install DOGE="such wow"

OUT

}



@test "custom relative install destination" {

  export RUBY_BUILD_CACHE_PATH="$FIXTURE_ROOT"