qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Alex Bennée" <alex.bennee@linaro.org>
To: peter.maydell@linaro.org
Cc: "Fam Zheng" <fam@euphon.net>,
	"Philippe Mathieu-Daudé" <philmd@redhat.com>,
	"Alex Bennée" <alex.bennee@linaro.org>,
	qemu-devel@nongnu.org
Subject: [PULL v2 06/14] travis.yml: duplicate before_script for MacOSX
Date: Thu,  9 Jan 2020 14:18:50 +0000	[thread overview]
Message-ID: <20200109141858.14376-7-alex.bennee@linaro.org> (raw)
In-Reply-To: <20200109141858.14376-1-alex.bennee@linaro.org>

Rather than keep the hack in the global code lets "Think Different"
and have a special copy for MacOSX.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

diff --git a/.travis.yml b/.travis.yml
index 848a2714efe..6826618ea81 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -89,7 +89,6 @@ git:
 
 
 before_script:
-  - if [ "$TRAVIS_OS_NAME" == "osx" ] ; then export PATH="/usr/local/opt/ccache/libexec:$PATH" ; fi
   - if command -v ccache ; then ccache --zero-stats ; fi
   - mkdir -p ${BUILD_DIR} && cd ${BUILD_DIR}
   - ${SRC_DIR}/configure ${BASE_CONFIG} ${CONFIG} || { cat config.log && exit 1; }
@@ -240,6 +239,11 @@ matrix:
       os: osx
       osx_image: xcode10.3
       compiler: clang
+      before_script:
+        - export PATH="/usr/local/opt/ccache/libexec:$PATH"
+        - if command -v ccache ; then ccache --zero-stats ; fi
+        - mkdir -p ${BUILD_DIR} && cd ${BUILD_DIR}
+        - ${SRC_DIR}/configure ${BASE_CONFIG} ${CONFIG} || { cat config.log && exit 1; }
 
 
     # Python builds
-- 
2.20.1



  parent reply	other threads:[~2020-01-09 14:24 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-01-09 14:18 [PULL v2 00/14] testing fixes and semihosting console support Alex Bennée
2020-01-09 14:18 ` [PULL v2 01/14] hw/i386/x86-iommu: Add missing stubs Alex Bennée
2020-01-09 14:18 ` [PULL v2 02/14] tests/vm: update openbsd to release 6.6 Alex Bennée
2020-01-09 14:18 ` [PULL v2 03/14] freebsd: use python37 Alex Bennée
2020-01-09 14:18 ` [PULL v2 04/14] travis.yml: avocado: Print logs of non-pass tests only Alex Bennée
2020-01-09 14:18 ` [PULL v2 05/14] travis.yml: Detach build and test steps Alex Bennée
2020-01-09 14:18 ` Alex Bennée [this message]
2020-01-09 14:18 ` [PULL v2 07/14] travis.yml: install homebrew python for OS X Alex Bennée
2020-01-09 14:18 ` [PULL v2 08/14] testing: don't nest build for fp-test Alex Bennée
2020-01-09 14:18 ` [PULL v2 09/14] target/arm: remove unused EXCP_SEMIHOST leg Alex Bennée
2020-01-09 14:18 ` [PULL v2 10/14] target/arm: only update pc after semihosting completes Alex Bennée
2020-01-09 14:18 ` [PULL v2 11/14] semihosting: add qemu_semihosting_console_inc for SYS_READC Alex Bennée
2020-01-24 12:58   ` Peter Maydell
2020-01-24 18:45     ` Keith Packard via
2020-01-09 14:18 ` [PULL v2 12/14] tests/tcg: add a dumb-as-bricks semihosting console test Alex Bennée
2020-01-09 14:18 ` [PULL v2 13/14] tests/tcg: extract __semi_call into a header and expand Alex Bennée
2020-01-09 14:18 ` [PULL v2 14/14] tests/tcg: add user version of dumb-as-bricks semiconsole test Alex Bennée
2020-01-10 14:12 ` [PULL v2 00/14] testing fixes and semihosting console support Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200109141858.14376-7-alex.bennee@linaro.org \
    --to=alex.bennee@linaro.org \
    --cc=fam@euphon.net \
    --cc=peter.maydell@linaro.org \
    --cc=philmd@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).