Skip to content

Commit

Permalink
make sure we invoke the compile rake task where necessary
Browse files Browse the repository at this point in the history
related to commit 609cdde
  • Loading branch information
flavorjones committed Jan 21, 2019
1 parent f8d8cd6 commit 72a58dc
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion build_all
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ mkdir -p gems

# MRI et al (standard gem)
bundle exec rake clean
bundle exec rake test
bundle exec rake compile test
bundle exec rake gem
cp -v pkg/nokogiri*.gem gems

Expand Down
2 changes: 1 addition & 1 deletion concourse/tasks/gem-test/gem-install-and-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ popd
pushd nokogiri

bundle install
rake test
rake test # we're testing the installed gem, so we don't compile or use bundler

popd
2 changes: 1 addition & 1 deletion concourse/tasks/rake-test/run.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ push-location nokogiri

system-cmd "gem install bundler"
system-cmd "bundle install"
system-cmd "bundle exec rake test"
system-cmd "bundle exec rake compile test"

pop-location
6 changes: 3 additions & 3 deletions concourse/tasks/rake-test/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ function rbx-engine {

pushd nokogiri

RAKE_TASK="test"
test_task="test"

if rbx-engine ; then
ensure-apt-update
Expand All @@ -72,7 +72,7 @@ pushd nokogiri
fi

if [[ ${TEST_WITH_VALGRIND:-} != "" ]] ; then
RAKE_TASK="test:valgrind" # override
test_task="test:valgrind" # override
export TESTOPTS="-v" # see more verbose output to help narrow down warnings

# always use the CI suppressions if they exist
Expand All @@ -82,6 +82,6 @@ pushd nokogiri
fi
fi

bundle exec rake ${RAKE_TASK}
bundle exec rake compile ${test_task}

popd

0 comments on commit 72a58dc

Please sign in to comment.