aboutsummaryrefslogtreecommitdiffhomepage
path: root/java
diff options
context:
space:
mode:
authorGravatar Tamir Duberstein <tamird@gmail.com>2015-03-31 20:28:27 -0700
committerGravatar Tamir Duberstein <tamird@gmail.com>2015-04-02 15:06:02 -0700
commit2820e86aab2417a8274dc64a6d5de62f1fcaedc8 (patch)
tree7136b73214dcd3f4a594ddf11be38ee66ea8b95b /java
parent9a2f1f64eb978a6bfbff2196a777cb1dd9bde6c5 (diff)
Skip 3-byte test in CI
Diffstat (limited to 'java')
-rw-r--r--java/src/test/java/com/google/protobuf/IsValidUtf8Test.java7
1 files changed, 5 insertions, 2 deletions
diff --git a/java/src/test/java/com/google/protobuf/IsValidUtf8Test.java b/java/src/test/java/com/google/protobuf/IsValidUtf8Test.java
index 89b64519..8751baae 100644
--- 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);
+ }
}
/**