diff options
| author | Stefan Radomski <github@mintwerk.de> | 2017-01-09 10:25:54 (GMT) |
|---|---|---|
| committer | Stefan Radomski <github@mintwerk.de> | 2017-01-09 10:25:54 (GMT) |
| commit | 9cc4cdc7a79597df8eaa7dbb441197b574782707 (patch) | |
| tree | 99a5855e3477afbcb039f07420c223bf0db2408c | |
| parent | 0e0b1e365842f62c714247c32692606d0ec7b21a (diff) | |
| download | uscxml-9cc4cdc7a79597df8eaa7dbb441197b574782707.zip uscxml-9cc4cdc7a79597df8eaa7dbb441197b574782707.tar.gz uscxml-9cc4cdc7a79597df8eaa7dbb441197b574782707.tar.bz2 | |
Fixed windows build and excluded MacOS/gcc
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rw-r--r-- | test/src/test-url.cpp | 2 |
2 files changed, 5 insertions, 1 deletions
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!
|