From 9a7bf492498f01404f577e7589ae0b6f541a43cb Mon Sep 17 00:00:00 2001
From: fivepiece <fivepiece@users.noreply.github.com>
Date: Fri, 24 Nov 2017 18:12:11 +0200
Subject: [PATCH] simple osx build on travis

---
 .travis.yml       | 22 ++++++++++++++--------
 test/run_tests.sh | 15 ++++++++++-----
 2 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4515f0c..8018d27 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,20 +1,26 @@
 sudo: required
+os:
+  - linux
+  - osx
 dist: trusty
-language: python
-python:
-  - "2.7_with_system_site_packages"
+addons:
+  apt:
+    sources:
+    - sourceline: 'ppa:bitcoin/bitcoin'
+      key_url: 'http://keyserver.ubuntu.com:11371/pks/lookup?op=get&search=0xD46F45428842CE5E'
+    packages:
+      - bitcoind
 before_install:
-  - sudo apt-add-repository ppa:bitcoin/bitcoin -y
-  - sudo apt-get update -q
-  - sudo apt-get install --no-install-recommends --no-upgrade -qq bitcoind
+  - do_on(){ if [ "$TRAVIS_OS_NAME" = "$1" ]; then shift; $@ ; fi; }
 install:
   - ./install.sh --develop --no-gpg-validation
 before_script:
   - source jmvenv/bin/activate
 script:
-  - ./test/run_tests.sh
+  - do_on linux bitcoind --help | head -1
+  - do_on linux ./test/run_tests.sh
 after_success:
-  - coveralls
+  - do_on linux coveralls
 branches:
  only:
   - master
diff --git a/test/run_tests.sh b/test/run_tests.sh
index 7ef85b5..2835ce6 100755
--- a/test/run_tests.sh
+++ b/test/run_tests.sh
@@ -17,7 +17,7 @@ run_jm_tests ()
     curl -L https://github.com/JoinMarket-Org/miniircd/archive/master.tar.gz -o miniircd.tar.gz
     rm -rf ./miniircd
     mkdir -p miniircd
-    tar xaf miniircd.tar.gz -C ./miniircd --strip-components=1
+    tar -xzf miniircd.tar.gz -C ./miniircd --strip-components=1
     if ! pip install -r ./requirements-dev.txt; then
         echo "Packages in 'requirements-dev.txt' could not be installed. Exiting."
         return 1
@@ -26,8 +26,8 @@ run_jm_tests ()
         mv ./joinmarket.cfg ./joinmarket.cfg.bak
 		echo "file 'joinmarket.cfg' moved to 'joinmarket.cfg.bak'"
     fi
-    for dir in '/dev/shm' '/tmp' "${jm_source}/test"; do
-        if [[ -d "${dir}" && -r "${dir}" ]]; then
+    for dir in '/dev/shm' '/Volumes/ramdisk' '/tmp' "${jm_source}/test"; do
+        if [[ -d "${dir}" && -r "${dir}" && -w "${dir}" && -x "${dir}" ]]; then
             jm_test_datadir="${dir}/jm_test_home/.bitcoin"
             break
         fi
@@ -49,9 +49,14 @@ run_jm_tests ()
     local success="$?"
     unlink ./joinmarket.cfg
     if read bitcoind_pid <"${jm_test_datadir}/bitcoind.pid"; then
-        pkill -15 ${bitcoind_pid} || pkill -9 ${bitcoind_pid}
+        kill -15 ${bitcoind_pid} || kill -9 ${bitcoind_pid}
+    fi
+    if [[ "${HAS_JOSH_K_SEAL_OF_APPROVAL}" = true ]] && (( ${success} != 0 )); then
+        tail -100 "${jm_test_datadir}/regtest/debug.log"
+        find "${jm_test_datadir}"
+    else
+        rm -rf "${jm_test_datadir}"
     fi
-    rm -rf "${jm_test_datadir}"
     return ${success:-1}
 }
 run_jm_tests