merge v07-develop

xerial · xerial · commit 46c655778468 · 2015-01-29T01:14:07.000+09:00
diff --git a/.travis.yml b/.travis.yml
@@ -2,8 +2,6 @@ language: scala
 scala:
    - 2.11.1
 
-sudo: false
-
 jdk:
   - openjdk6
   - openjdk7
@@ -14,14 +12,7 @@ branches:
   only:
     - /^v07.*$/
 
-script:
-  - sbt ++$TRAVIS_SCALA_VERSION test
-  - find $HOME/.sbt -name "*.lock" | xargs rm
-  - find $HOME/.ivy2 -name "ivydata-*.properties" | xargs rm
-
-cache:
-  directories:
-    - $HOME/.ivy2/cache
+script: sbt ++$TRAVIS_SCALA_VERSION test
 
 notifications:
   email:
diff --git a/msgpack-core/src/test/scala/org/msgpack/core/MessageUnpackerTest.scala b/msgpack-core/src/test/scala/org/msgpack/core/MessageUnpackerTest.scala
@@ -552,8 +552,8 @@ class MessageUnpackerTest extends MessagePackSpec {
       val arr = out.toByteArray
       val mb = MessageBuffer.wrap(arr)
 
-      val N = 2000
-      val t = time("unpacker", repeat = 30) {
+      val N = 1000
+      val t = time("unpacker", repeat = 10) {
         block("no-buffer-reset") {
           IOUtil.withResource(msgpack.newUnpacker(arr)) { unpacker =>
             for (i <- 0 until N) {
