Просмотр исходного кода

Remove --configure-on-demand and --parallel where they don't do much

Logan Stucki 9 лет назад
Родитель
Сommit
8b20844820
Аккаунт пользователя с таким Email не найден
2 измененных файлов: 5 добавлений и 6 удалений
  1. 4
    4
      bin/journey-test.sh
  2. 1
    2
      bin/unit-tests.sh

+ 4
- 4
bin/journey-test.sh Просмотреть файл

@@ -164,7 +164,7 @@ make_local_trackler() {
164 164
   cp -r ${track_root}/exercises tracks/${TRACK}
165 165
 
166 166
   gem install bundler
167
-  bundle install -j4
167
+  bundle install --jobs $((`nproc --all`-1))
168 168
   gem build trackler.gemspec
169 169
 
170 170
   # Make *this* the gem that x-api uses when we build x-api.
@@ -181,7 +181,7 @@ start_x_api() {
181 181
   pushd $xapi_home
182 182
 
183 183
   gem install bundler
184
-  bundle install -j4
184
+  bundle install --jobs $((`nproc --all`-1))
185 185
   RACK_ENV=development rackup &
186 186
   xapi_pid=$!
187 187
   sleep 5
@@ -233,7 +233,7 @@ solve_all_exercises() {
233 233
 
234 234
     pushd ${exercism_exercises_dir}/${TRACK}/${exercise}
235 235
     # Check that tests compile before we strip @Ignore annotations
236
-    "$EXECPATH"/gradlew compileTestJava --configure-on-demand --parallel
236
+    "$EXECPATH"/gradlew compileTestJava
237 237
     # Ensure we run all the tests (as delivered, all but the first is @Ignore'd)
238 238
     for testfile in `find . -name "*Test.${TRACK_SRC_EXT}"`; do
239 239
       # Strip @Ignore annotations to ensure we run the tests (as delivered, all but the first is @Ignore'd).
@@ -241,7 +241,7 @@ solve_all_exercises() {
241 241
       # The stripping implementations here and in copyTestsFilteringIgnores should be kept consistent.
242 242
       sed 's/@Ignore\(\(.*\)\)\{0,1\}//' ${testfile} > "${tempfile}" && mv "${tempfile}" "${testfile}"
243 243
     done
244
-    "$EXECPATH"/gradlew test --configure-on-demand --parallel &
244
+    "$EXECPATH"/gradlew test
245 245
     popd
246 246
 
247 247
     current_exercise_number=$((current_exercise_number + 1))

+ 1
- 2
bin/unit-tests.sh Просмотреть файл

@@ -10,6 +10,5 @@ bin/configlet .
10 10
 pushd exercises
11 11
 echo ""
12 12
 echo ">>> Running tests..."
13
-TERM=dumb ../gradlew check compileStarterSourceJava --parallel --configure-on-demand --continue
13
+TERM=dumb ../gradlew check compileStarterSourceJava --parallel --continue
14 14
 popd
15
-