From 22a173df3f462244103a02261c276eeee8926863 Mon Sep 17 00:00:00 2001
From: shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 22 Aug 2012 02:38:55 +0000
Subject: [PATCH] * .travis.yml (before_script): Turned out that make -j is
 broken.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36772 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 .travis.yml | 4 ++--
 ChangeLog   | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 691348615b..44f96b28d8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -40,8 +40,8 @@ install: "sudo apt-get -qq build-dep ruby1.9.1 2>/dev/null"
 before_script:
   - "autoconf"
   - "./configure --with-gcc=$CC"
-  - "make -sj miniruby"
-  - "make -sj all"
+  - "make -s miniruby"
+  - "make -s all"
 script: "make test"
 
 # Branch matrix.  Not all branches are Travis-ready so we limit branches here.
diff --git a/ChangeLog b/ChangeLog
index 094e38d314..f331f2c12c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Aug 22 11:38:16 2012  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* .travis.yml (before_script): Turned out that make -j is broken.
+
 Wed Aug 22 11:23:35 2012  Shugo Maeda  <shugo@ruby-lang.org>
 
 	* vm_insnhelper.c (vm_setup_method): should not enable tail call