From 08ef146e45a5341dc28d189773307151bc846fd4 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 23 May 2017 12:42:40 +0000
Subject: out-of-place on travis

* .travis.yml (before_script, script): out-of-place build.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@58856 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 .travis.yml | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index af90804269..2220fcdae8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -35,24 +35,26 @@ before_script:
   - "uname -r"
   - "rm -fr .ext autom4te.cache"
   - "echo $TERM"
-  - "make -f common.mk BASERUBY=ruby MAKEDIRS='mkdir -p' srcdir=. update-config_files"
-  - "autoconf"
-  - "mkdir config_1st config_2nd"
-  - "./configure -C --disable-install-doc --with-gcc=$CC $CONFIG_FLAG"
-  - "cp -pr config.status .ext/include config_1st"
-  - "make reconfig"
-  - "cp -pr config.status .ext/include config_2nd"
-  - "diff -ru config_1st config_2nd"
+  - "> config.status"
+  - "sed -f tool/prereq.status Makefile.in common.mk > Makefile"
+  - "make update-config_files"
   - "make touch-unicode-files"
-  - "make after-update BASERUBY=ruby BOOTSTRAPRUBY='$(BASERUBY)' MINIRUBY='$(BASERUBY)' UNICODE_FILES=. PREP= CC=false"
-  - "make -s $JOBS"
+  - "make srcs UNICODE_FILES=."
   - "make update-rubyspec"
-  - "requests="
-  - "for req in ${RUBYSPEC_PULL_REQUEST//,/ }; do
+  - "requests=; for req in ${RUBYSPEC_PULL_REQUEST//,/ }; do
       requests=\"$requests +refs/pull/$req/merge:\";
     done"
   - "${requests:+git -C spec/rubyspec -c user.email=none -c user.name=none pull --no-edit origin $requests}"
   - "${requests:+git -C spec/rubyspec log --oneline origin/master..@}"
+  - "rm config.status Makefile rbconfig.rb .rbconfig.time"
+  - "mkdir build config_1st config_2nd"
+  - "cd build"
+  - "../configure -C --disable-install-doc --with-gcc=$CC $CONFIG_FLAG"
+  - "cp -pr config.cache config.status .ext/include ../config_1st"
+  - "make reconfig"
+  - "cp -pr config.cache config.status .ext/include ../config_2nd"
+  - "(cd .. && exec diff -ru config_1st config_2nd)"
+  - "make -s $JOBS"
 
 script:
   - "make -s test TESTOPTS=--color=never"
-- 
cgit v1.2.3