Skip to content

Commit 8b20844

Browse files
committed
Remove --configure-on-demand and --parallel where they don't do much
Configure amount of bundle jobs based on n-1 cores. [See here](http://archlever.blogspot.com/2013/09/lies-damned-lies-and-truths-backed-by.html)
1 parent 059eeca commit 8b20844

2 files changed

Lines changed: 5 additions & 6 deletions

File tree

bin/journey-test.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ make_local_trackler() {
164164
cp -r ${track_root}/exercises tracks/${TRACK}
165165

166166
gem install bundler
167-
bundle install -j4
167+
bundle install --jobs $((`nproc --all`-1))
168168
gem build trackler.gemspec
169169

170170
# Make *this* the gem that x-api uses when we build x-api.
@@ -181,7 +181,7 @@ start_x_api() {
181181
pushd $xapi_home
182182

183183
gem install bundler
184-
bundle install -j4
184+
bundle install --jobs $((`nproc --all`-1))
185185
RACK_ENV=development rackup &
186186
xapi_pid=$!
187187
sleep 5
@@ -233,15 +233,15 @@ solve_all_exercises() {
233233

234234
pushd ${exercism_exercises_dir}/${TRACK}/${exercise}
235235
# Check that tests compile before we strip @Ignore annotations
236-
"$EXECPATH"/gradlew compileTestJava --configure-on-demand --parallel
236+
"$EXECPATH"/gradlew compileTestJava
237237
# Ensure we run all the tests (as delivered, all but the first is @Ignore'd)
238238
for testfile in `find . -name "*Test.${TRACK_SRC_EXT}"`; do
239239
# Strip @Ignore annotations to ensure we run the tests (as delivered, all but the first is @Ignore'd).
240240
# Note that unit-test.sh also strips @Ignore annotations via the Gradle task copyTestsFilteringIgnores.
241241
# The stripping implementations here and in copyTestsFilteringIgnores should be kept consistent.
242242
sed 's/@Ignore\(\(.*\)\)\{0,1\}//' ${testfile} > "${tempfile}" && mv "${tempfile}" "${testfile}"
243243
done
244-
"$EXECPATH"/gradlew test --configure-on-demand --parallel &
244+
"$EXECPATH"/gradlew test
245245
popd
246246

247247
current_exercise_number=$((current_exercise_number + 1))

bin/unit-tests.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,5 @@ bin/configlet .
1010
pushd exercises
1111
echo ""
1212
echo ">>> Running tests..."
13-
TERM=dumb ../gradlew check compileStarterSourceJava --parallel --configure-on-demand --continue
13+
TERM=dumb ../gradlew check compileStarterSourceJava --parallel --continue
1414
popd
15-

0 commit comments

Comments
 (0)