Skip 3-byte test in CI

2015-03-31 20:28:27 -07:00 · 2015-03-31 20:28:27 -07:00 · 2820e86aab
commit 2820e86aab
parent 9a2f1f64eb
1 changed files with 5 additions and 2 deletions
--- a/java/src/test/java/com/google/protobuf/IsValidUtf8Test.java
+++ b/java/src/test/java/com/google/protobuf/IsValidUtf8Test.java
@ -72,8 +72,11 @@ public class IsValidUtf8Test extends TestCase {
   * Tests that round tripping of all three byte permutations work.
   */
  public void testIsValidUtf8_3Bytes() throws UnsupportedEncodingException {
-    IsValidUtf8TestUtil.testBytes(3,
-        IsValidUtf8TestUtil.EXPECTED_THREE_BYTE_ROUNDTRIPPABLE_COUNT);
+    // Travis' OOM killer doesn't like this test
+    if (System.getenv("TRAVIS") == null) {
+      IsValidUtf8TestUtil.testBytes(3,
+          IsValidUtf8TestUtil.EXPECTED_THREE_BYTE_ROUNDTRIPPABLE_COUNT);
+    }
  }

  /**