From 00d519d55c00ced7ed574d899c24fe0cc7534ad6 Mon Sep 17 00:00:00 2001 From: Sam Huffman Date: Fri, 18 Jan 2019 14:25:21 -0800 Subject: [PATCH 1/5] Test on OS X --- .travis.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.travis.yml b/.travis.yml index e245b1a..61a1909 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,9 @@ +os: + - linux + - osx + language: python python: - '3.5' + script: ./t/regress.sh From 9562a6e1c69ef38ab9ca670cd7049b249eeea299 Mon Sep 17 00:00:00 2001 From: Sam Huffman Date: Fri, 18 Jan 2019 15:19:01 -0800 Subject: [PATCH 2/5] Try a more portable approach to realpath... --- t/regress.sh | 5 ++--- t/regress_util.sh | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/t/regress.sh b/t/regress.sh index a7bdd64..41af06e 100755 --- a/t/regress.sh +++ b/t/regress.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +. $(dirname $0)/regress_util.sh + ## List of tests to ignore test_ignore_list=( test_fail ) ignore_test () { @@ -11,9 +13,6 @@ ignore_test () { fi } -test_root=$(dirname $(readlink -f $0)) -wit_root=$(readlink -f $test_root/..) - export PATH=$wit_root:${PATH} timestamp=`date +'%Y-%m-%dT%H-%M-%S'` diff --git a/t/regress_util.sh b/t/regress_util.sh index d919a04..3108509 100755 --- a/t/regress_util.sh +++ b/t/regress_util.sh @@ -1,8 +1,8 @@ #!/bin/sh +test_root=$(dirname $(perl -MCwd -M5.14.0 -e "say Cwd::realpath('$0')")) +wit_root=$(perl -MCwd -M5.14.0 -e "say Cwd::realpath('$test_root/..')") wit_repo='git@github.com:sifive/wit' -test_root=$(dirname $(readlink -f $0)) -wit_root=$(readlink -f $test_root/..) export PATH=$wit_root:${PATH} From b44d24642ca76db2ee3f46979ab80c3267b43661 Mon Sep 17 00:00:00 2001 From: Sam Huffman Date: Fri, 18 Jan 2019 15:27:48 -0800 Subject: [PATCH 3/5] Try python 3.7. 3.5 isn't on travis osx image --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 61a1909..0dc165e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,6 @@ os: language: python python: - - '3.5' + - '3.7' script: ./t/regress.sh From 293c7af8ab9a8b14cf8fafe7d591e4157b8e3ca8 Mon Sep 17 00:00:00 2001 From: Sam Huffman Date: Fri, 18 Jan 2019 15:33:34 -0800 Subject: [PATCH 4/5] Try python 3.7. 3.5 isn't on travis osx image --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 0dc165e..35f2770 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,6 @@ os: language: python python: - - '3.7' + - '3.7.1' script: ./t/regress.sh From c45cb6c513dbd89aa29b87a871511845cccf4398 Mon Sep 17 00:00:00 2001 From: Sam Huffman Date: Fri, 18 Jan 2019 15:56:20 -0800 Subject: [PATCH 5/5] Try python 3.7. 3.5 isn't on travis osx image --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 35f2770..61a1909 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,6 @@ os: language: python python: - - '3.7.1' + - '3.5' script: ./t/regress.sh