diff options
| author | Andreas Rumpf <rumpf_a@web.de> | 2017-03-29 10:14:03 +0200 |
|---|---|---|
| committer | Andreas Rumpf <rumpf_a@web.de> | 2017-03-29 10:14:03 +0200 |
| commit | 3ffde39cf416579144d37021f24c99e49efc0aee (patch) | |
| tree | 329f976acf0c2b07da57e242820c8aba41c6f5d6 | |
| parent | a88a9095654ec4c7f0dd803e164047a464fba829 (diff) | |
| download | Nim-3ffde39cf416579144d37021f24c99e49efc0aee.tar.gz | |
attempt to make travis OSX tests green and mandatory
| -rw-r--r-- | .travis.yml | 14 | ||||
| -rw-r--r-- | lib/packages/fsmonitor.nim (renamed from lib/pure/fsmonitor.nim) | 0 | ||||
| -rw-r--r-- | tests/coroutines/twait.nim | 1 | ||||
| -rw-r--r-- | web/website.ini | 2 |
4 files changed, 7 insertions, 10 deletions
diff --git a/.travis.yml b/.travis.yml index 282254b5d..a4eb55ff1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,20 +5,17 @@ os: - osx dist: trusty -matrix: - allow_failures: - - os: osx - addons: apt: packages: - libcurl4-openssl-dev - libsdl1.2-dev - libgc-dev - brew: - packages: - - boehmgc - - node + +before_install: + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install boehmgc; fi + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install node; fi before_script: - set -e @@ -42,4 +39,3 @@ script: - nim c --taintMode:on -d:nimCoroutines tests/testament/tester - tests/testament/tester --pedantic all -d:nimCoroutines - ./koch csource - - ./koch xz diff --git a/lib/pure/fsmonitor.nim b/lib/packages/fsmonitor.nim index b22e84f44..b22e84f44 100644 --- a/lib/pure/fsmonitor.nim +++ b/lib/packages/fsmonitor.nim diff --git a/tests/coroutines/twait.nim b/tests/coroutines/twait.nim index d8752b094..eb2765be4 100644 --- a/tests/coroutines/twait.nim +++ b/tests/coroutines/twait.nim @@ -1,5 +1,6 @@ discard """ output: "Exit 1\nExit 2" + disabled: "macosx" """ import coro diff --git a/web/website.ini b/web/website.ini index f4954a4cb..13e9b97e8 100644 --- a/web/website.ini +++ b/web/website.ini @@ -46,7 +46,7 @@ srcdoc2: "pure/parsecfg;pure/parsexml;pure/parsecsv;pure/parsesql" srcdoc2: "pure/streams;pure/terminal;pure/cgi;pure/unicode;pure/strmisc" srcdoc2: "pure/htmlgen;pure/parseutils;pure/browsers" srcdoc2: "impure/db_postgres;impure/db_mysql;impure/db_sqlite;pure/db_common" -srcdoc2: "pure/httpserver;pure/httpclient;pure/smtp;impure/ssl;pure/fsmonitor" +srcdoc2: "pure/httpserver;pure/httpclient;pure/smtp;impure/ssl" srcdoc2: "pure/ropes;pure/unidecode/unidecode;pure/xmldom;pure/xmldomparser" srcdoc2: "pure/xmlparser;pure/htmlparser;pure/xmltree;pure/colors;pure/mimetypes" srcdoc2: "pure/json;pure/base64;pure/scgi" |