* Fixed intermittent failures in rake_test

* Start testing JRuby 1.7.12
ruboto · Apr 17, 2014 · f6e1e02 · f6e1e02
1 parent 37340aa
commit f6e1e02
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -22,18 +22,18 @@ env:
     - ANDROID_TARGET=17 RUBOTO_PLATFORM=FROM_GEM   TEST_PART=2of5
     - ANDROID_TARGET=17 RUBOTO_PLATFORM=STANDALONE TEST_PART=3of5
     - ANDROID_TARGET=17 RUBOTO_PLATFORM=STANDALONE TEST_PART=4of5 JRUBY_JARS_VERSION=1.7.11
-    - ANDROID_TARGET=17 RUBOTO_PLATFORM=STANDALONE TEST_PART=5of5 JRUBY_JARS_VERSION=1.7.10
+    - ANDROID_TARGET=17 RUBOTO_PLATFORM=STANDALONE TEST_PART=5of5 JRUBY_JARS_VERSION=1.7.12
 
     - ANDROID_TARGET=16 RUBOTO_PLATFORM=CURRENT    TEST_PART=1of5
     - ANDROID_TARGET=16 RUBOTO_PLATFORM=FROM_GEM   TEST_PART=2of5
-    - ANDROID_TARGET=16 RUBOTO_PLATFORM=STANDALONE TEST_PART=3of5 JRUBY_JARS_VERSION=1.7.10
+    - ANDROID_TARGET=16 RUBOTO_PLATFORM=STANDALONE TEST_PART=3of5 JRUBY_JARS_VERSION=1.7.12
     - ANDROID_TARGET=16 RUBOTO_PLATFORM=STANDALONE TEST_PART=4of5
     - ANDROID_TARGET=16 RUBOTO_PLATFORM=STANDALONE TEST_PART=5of5 JRUBY_JARS_VERSION=1.7.11
 
     - ANDROID_TARGET=15 RUBOTO_PLATFORM=CURRENT    TEST_PART=1of5
     - ANDROID_TARGET=15 RUBOTO_PLATFORM=FROM_GEM   TEST_PART=2of5
     - ANDROID_TARGET=15 RUBOTO_PLATFORM=STANDALONE TEST_PART=3of5 JRUBY_JARS_VERSION=1.7.11
-    - ANDROID_TARGET=15 RUBOTO_PLATFORM=STANDALONE TEST_PART=4of5 JRUBY_JARS_VERSION=1.7.10
+    - ANDROID_TARGET=15 RUBOTO_PLATFORM=STANDALONE TEST_PART=4of5 JRUBY_JARS_VERSION=1.7.12
     - ANDROID_TARGET=15 RUBOTO_PLATFORM=STANDALONE TEST_PART=5of5
 
 matrix:

diff --git a/assets/rakelib/ruboto.rake b/assets/rakelib/ruboto.rake
@@ -683,8 +683,8 @@ end
 def build_apk(t, release)
   apk_file = release ? RELEASE_APK_FILE : APK_FILE
   if File.exist?(apk_file)
-    changed_prereqs = t.prerequisites.select do |p|
-      File.file?(p) && !Dir[p].empty? && Dir[p].map { |f| File.mtime(f) }.max > File.mtime(apk_file)
+    changed_prereqs = t.prerequisites.select do |pr|
+      File.file?(pr) && !Dir[pr].empty? && Dir[pr].map { |f| File.mtime(f) }.max >= File.mtime(apk_file)
     end
     return false if changed_prereqs.empty?
     changed_prereqs.each { |f| puts "#{f} changed." }

diff --git a/matrix_tests.sh b/matrix_tests.sh
@@ -13,7 +13,7 @@ fi
 ANDROID_TARGETS="19 18 17 16 15" # We should cover at least 90% of the market
 PLATFORM_MODES="CURRENT FROM_GEM STANDALONE"
 MASTER=`ls jruby-jars-*.dev.gem | tail -n 1 | cut -f 3 -d'-' | sed s/\\.gem//`
-STANDALONE_JRUBY_VERSIONS="$MASTER 1.7.12 1.7.11 1.7.10"
+STANDALONE_JRUBY_VERSIONS="$MASTER 1.7.12 1.7.11"
 RUBOTO_UPDATE_EXAMPLES=1
 # export STRIP_INVOKERS=1
 

diff --git a/test/minimal_app_test.rb b/test/minimal_app_test.rb
@@ -19,6 +19,7 @@ def teardown
     # APK was 4.3MB.  JRuby: 1.7.5, ANDROID_TARGET: 16
     # APK was 8.4MB.  JRuby: 1.7.8, ANDROID_TARGET: 10
     # APK was 4.3MB.  JRuby: 1.7.8, ANDROID_TARGET: 16
+    # APK was 4.4MB.  JRuby: 1.7.12, ANDROID_TARGET: 19
     # APK was 4.2MB.  JRuby: 9000.dev, ANDROID_TARGET: 10
     # APK was 4.2MB.  JRuby: 9000.dev, ANDROID_TARGET: 15
     # APK was 4.5MB.  JRuby: 9000.dev, ANDROID_TARGET: 16
@@ -30,6 +31,7 @@ def test_minimal_apk_is_within_limits
           '1.7.9' => 4.3,
           '1.7.10' => 4.4,
           '1.7.11' => 4.4,
+          '1.7.12' => 4.4,
           '9000.dev' => 4.5,
       }[JRUBY_JARS_VERSION.to_s] || 4.3
       lower_limit = upper_limit * 0.9

diff --git a/test/ruboto_gen_test.rb b/test/ruboto_gen_test.rb
@@ -64,6 +64,7 @@ def test_gen_class_activity_with_lowercase_should_fail
   # APK was  8791.2KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 16, JRuby: 1.7.10
   # APK was  8575.0KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 10, JRuby: 1.7.11
   # APK was  8793.4KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 16, JRuby: 1.7.11
+  # APK was  8820.3KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 19, JRuby: 1.7.12
   # APK was  6689.5KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 10, JRuby: 9000.dev
   # APK was  7012.2KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 16, JRuby: 9000.dev
   # APK was  7201.1KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 17, JRuby: 9000.dev
@@ -80,6 +81,7 @@ def test_new_apk_size_is_within_limits
           '1.7.9' => 8800.0,
           '1.7.10' => 8800.0,
           '1.7.11' => 8800.0,
+          '1.7.12' => 8900.0,
           '9000.dev' => 7300.0,
       }[JRUBY_JARS_VERSION.to_s] || 0.0
       version << ", JRuby: #{JRUBY_JARS_VERSION.to_s}"