Upgrade to build-tools 22.0.1.

Lower dx heap size: 1290MB
Only test Android 4.4 + JRuby 1.7.13.
Better test process killing.

.travis.yml

@@ -4,7 +4,7 @@ language: android
 sudo: false
 android:
   components:
-    - build-tools-22.0.0
+    - build-tools-22.0.1
 
 os:
   - linux
@@ -20,9 +20,8 @@ before_install:
 
 env:
   global:
-    - DX_HEAP_SIZE=1536
+    - DX_HEAP_SIZE=1290
     - RUBOTO_UPDATE_EXAMPLES=0
-#    - RVM=2.1
 
   matrix:
     - ANDROID_TARGET=19 RUBOTO_PLATFORM=STANDALONE TEST_PART=1of5 JRUBY_JARS_VERSION=1.7.13

Rakefile

@@ -549,25 +549,26 @@ end
 task '.travis.yml' do
   puts "Regenerating #{'.travis.yml'}"
   source = File.read('.travis.yml')
+  test_parts = 5
   matrix = ''
   allow_failures = ''
   # FIXME(uwe):  Test the newest api levels
   # [21, 19, 18, 17, 16, 15].each.with_index do |api, i|
-  [19, 15].each.with_index do |api, i|
+  [19].each.with_index do |api, i|
     n = i
     # FIXME(uwe):  JRuby 1.7.13 works for Nettbuss
     # FIXME(uwe):  JRuby 1.7.14 has a malformed gem
     # FIXME(uwe):  RubotoCore (CURRENT) is missing thread_safe
     # FIXME(uwe):  Test all of these that work
     # [['CURRENT', [nil]], ['FROM_GEM', [:MASTER, :STABLE]], ['STANDALONE', [:MASTER, :STABLE, '1.7.19', '1.7.18', '1.7.17', '1.7.16', '1.7.15', '1.7.13']]].each do |platform, versions|
     [
-        ['STANDALONE', ['1.7.13', '1.7.13', '1.7.13', '1.7.13', '1.7.13', '1.7.16', '1.7.15', ]],
-        ['FROM_GEM', ['1.7.13', :STABLE, ]],
+        ['STANDALONE', ['1.7.13', '1.7.13', '1.7.13', '1.7.13', '1.7.13', ]],
+        # ['FROM_GEM', ['1.7.13', :STABLE, ]],
         # ['CURRENT', [nil]],
     ].each do |platform, versions|
       versions.each do |v|
-        n = (n % 5) + 1
-        line = "    - ANDROID_TARGET=#{api} RUBOTO_PLATFORM=#{platform.ljust(10)} TEST_PART=#{n}of5#{" JRUBY_JARS_VERSION=#{v}" if v}\n"
+        n = (n % test_parts) + 1
+        line = "    - ANDROID_TARGET=#{api} RUBOTO_PLATFORM=#{platform.ljust(10)} TEST_PART=#{n}of#{test_parts}#{" JRUBY_JARS_VERSION=#{v}" if v}\n"
         matrix << line
         if v == :MASTER || # FIXME(uwe):  Remove when master branch is green.
             v == :STABLE || # FIXME(uwe):  Remove when stable branch is green.

run_tests.sh

@@ -7,6 +7,14 @@
 
 echo "Starting tests..."
 
+killtree() {
+    local parent=$1 child
+    for child in $(ps -o ppid= -o pid= | awk "\$1==$parent {print \$2}"); do
+        killtree $child
+    done
+    kill -9 $parent
+}
+
 # BEGIN TIMEOUT #
 TIMEOUT=3000 # 50 minutes
 BOSSPID=$$
@@ -15,7 +23,7 @@ BOSSPID=$$
   echo
   echo "Test timed out after $TIMEOUT seconds."
   echo
-  kill -9 -$BOSSPID
+  killtree -$BOSSPID
   echo
   echo Emulator log:
   echo
@@ -26,7 +34,7 @@ BOSSPID=$$
 TIMERPID=$!
 echo "PIDs: Boss: $BOSSPID, Timer: $TIMERPID"
 
-trap "kill -9 $TIMERPID" EXIT
+trap "killtree $TIMERPID" EXIT
 # END TIMEOUT #
 
 if [ ! $(command -v ant) ] ; then