From 00da73e56ceddd473ffd8fb58dd45d3b30e64cba Mon Sep 17 00:00:00 2001 From: Luke Childs Date: Tue, 18 Oct 2016 18:15:27 +0100 Subject: [PATCH 1/3] Run tests on OS X --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index d8a3387..7e01adb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,7 @@ language: generic +os: + # - linux + - osx sudo: required addons: apt: From be1efeb610782efd59a2e5e68d78b4d5e2ad9d3a Mon Sep 17 00:00:00 2001 From: Luke Childs Date: Wed, 19 Oct 2016 10:23:52 +0100 Subject: [PATCH 2/3] Only run bash tests for now --- .travis.yml | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7e01adb..3e2420b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,40 +35,40 @@ env: - PATH=$(echo $PATH | sed 's/::/:/') - NVM_DIR="${TRAVIS_BUILD_DIR}" matrix: - - SHELLCHECK=true + # - SHELLCHECK=true - SHELL=bash TEST_SUITE=install_script - - SHELL=sh TEST_SUITE=fast - - SHELL=dash TEST_SUITE=fast + # - SHELL=sh TEST_SUITE=fast + # - SHELL=dash TEST_SUITE=fast - SHELL=bash TEST_SUITE=fast - - SHELL=zsh TEST_SUITE=fast + # - SHELL=zsh TEST_SUITE=fast # - SHELL=ksh TEST_SUITE=fast - - SHELL=sh TEST_SUITE=sourcing - - SHELL=dash TEST_SUITE=sourcing + # - SHELL=sh TEST_SUITE=sourcing + # - SHELL=dash TEST_SUITE=sourcing - SHELL=bash TEST_SUITE=sourcing - - SHELL=zsh TEST_SUITE=sourcing + # - SHELL=zsh TEST_SUITE=sourcing # - SHELL=ksh TEST_SUITE=sourcing - - SHELL=sh TEST_SUITE=slow - - SHELL=dash TEST_SUITE=slow + # - SHELL=sh TEST_SUITE=slow + # - SHELL=dash TEST_SUITE=slow - SHELL=bash TEST_SUITE=slow - - SHELL=zsh TEST_SUITE=slow + # - SHELL=zsh TEST_SUITE=slow # - SHELL=ksh TEST_SUITE=slow - - SHELL=sh TEST_SUITE=installation_node + # - SHELL=sh TEST_SUITE=installation_node # - SHELL=sh TEST_SUITE=installation_node WITHOUT_CURL=1 - - SHELL=dash TEST_SUITE=installation_node + # - SHELL=dash TEST_SUITE=installation_node # - SHELL=dash TEST_SUITE=installation_node WITHOUT_CURL=1 - SHELL=bash TEST_SUITE=installation_node # - SHELL=bash TEST_SUITE=installation_node WITHOUT_CURL=1 - - SHELL=zsh TEST_SUITE=installation_node + # - SHELL=zsh TEST_SUITE=installation_node # - SHELL=zsh TEST_SUITE=installation_node WITHOUT_CURL=1 # - SHELL=ksh TEST_SUITE=installation_node # - SHELL=ksh TEST_SUITE=installation_node WITHOUT_CURL=1 - - SHELL=sh TEST_SUITE=installation_iojs + # - SHELL=sh TEST_SUITE=installation_iojs # - SHELL=sh TEST_SUITE=installation_iojs WITHOUT_CURL=1 - - SHELL=dash TEST_SUITE=installation_iojs + # - SHELL=dash TEST_SUITE=installation_iojs # - SHELL=dash TEST_SUITE=installation_iojs WITHOUT_CURL=1 - SHELL=bash TEST_SUITE=installation_iojs # - SHELL=bash TEST_SUITE=installation_iojs WITHOUT_CURL=1 - - SHELL=zsh TEST_SUITE=installation_iojs + # - SHELL=zsh TEST_SUITE=installation_iojs # - SHELL=zsh TEST_SUITE=installation_iojs WITHOUT_CURL=1 # - SHELL=ksh TEST_SUITE=installation_iojs # - SHELL=ksh TEST_SUITE=installation_iojs WITHOUT_CURL=1 From cf228ebbe58498d754c7984ae627a07297b9f375 Mon Sep 17 00:00:00 2001 From: Luke Childs Date: Wed, 19 Oct 2016 11:02:45 +0100 Subject: [PATCH 3/3] Get source installs working --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3e2420b..b6ccbdb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,4 @@ -language: generic +language: cpp os: # - linux - osx @@ -30,8 +30,8 @@ script: - if [ -z "${SHELLCHECK-}" ]; then make TEST_SUITE=$TEST_SUITE URCHIN=/tmp/urchin/package/urchin test-$SHELL ; fi env: global: - - CXX=g++-4.8 - - CC=gcc-4.8 + # - CXX=g++-4.8 + # - CC=gcc-4.8 - PATH=$(echo $PATH | sed 's/::/:/') - NVM_DIR="${TRAVIS_BUILD_DIR}" matrix: