Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
R
ruby-build
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
OpenEdx
ruby-build
Commits
37c9a046
Commit
37c9a046
authored
Jan 22, 2014
by
Eric Lindvall
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add test for MAKE_INSTALL_OPTS
Also fix the ordering of make install arguments
parent
93828a2d
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
1 deletions
+21
-1
bin/ruby-build
+1
-1
test/build.bats
+20
-0
No files found.
bin/ruby-build
View file @
37c9a046
...
@@ -411,7 +411,7 @@ build_package_standard() {
...
@@ -411,7 +411,7 @@ build_package_standard() {
)
>
&4 2>&1
)
>
&4 2>&1
{
"
$MAKE
"
$MAKE_OPTS
${
!PACKAGE_MAKE_OPTS
}
"
${
!PACKAGE_MAKE_OPTS_ARRAY
}
"
{
"
$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
}
>
&4 2>&1
}
}
...
...
test/build.bats
View file @
37c9a046
...
@@ -239,6 +239,26 @@ make install DOGE="such wow"
...
@@ -239,6 +239,26 @@ make install DOGE="such wow"
OUT
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" {
@test "custom relative install destination" {
export RUBY_BUILD_CACHE_PATH="$FIXTURE_ROOT"
export RUBY_BUILD_CACHE_PATH="$FIXTURE_ROOT"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment