From 9cc4cdc7a79597df8eaa7dbb441197b574782707 Mon Sep 17 00:00:00 2001 From: Stefan Radomski Date: Mon, 9 Jan 2017 11:25:54 +0100 Subject: Fixed windows build and excluded MacOS/gcc --- .travis.yml | 4 ++++ test/src/test-url.cpp | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b4b7faf..eec3000 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,6 +11,10 @@ compiler: - gcc - clang +exclude: +- os: osx + compiler: gcc + install: - if [ "$CXX" = "g++" ]; then export CXX="g++-4.9" CC="gcc-4.9"; fi - if [ "$CXX" = "clang++" ] && [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export CXX="clang++-3.6" CC="clang-3.6"; fi diff --git a/test/src/test-url.cpp b/test/src/test-url.cpp index c1a840f..51fb545 100644 --- a/test/src/test-url.cpp +++ b/test/src/test-url.cpp @@ -51,7 +51,7 @@ bool canResolve(const std::string& url) { bool dirExists(const std::string& path) { #ifdef _WIN32 - DWORD ftyp = GetFileAttributesA(dirName_in.c_str()); + DWORD ftyp = GetFileAttributesA(path.c_str()); if (ftyp == INVALID_FILE_ATTRIBUTES) return false; //something is wrong with your path! -- cgit v0.12