[travis] Fix unit tests on Mac.

- Use libc++ instead of libstdc++ in the conan profile
- Add CMAKE_OPTIONS for Mac
v0.27.3
Luis Díaz Más 8 years ago
parent 6d41884245
commit 3cf3635ae2

@ -13,7 +13,7 @@ matrix:
- os: osx
osx_image: xcode9
compiler: clang
env: PYTHON=3.6.2
env: PYTHON=3.6.2 CMAKE_OPTIONS="-DCMAKE_BUILD_TYPE=Release -DEXIV2_ENABLE_VIDEO=ON -DEXIV2_ENABLE_WEBREADY=ON -DEXIV2_BUILD_UNIT_TESTS=ON" # All enabled
env:
#- CMAKE_OPTIONS="-DCMAKE_BUILD_TYPE=Release" # Default

@ -40,6 +40,6 @@ if [[ "$(uname -s)" == 'Linux' ]]; then
printf "[settings]\nos=Linux\narch=x86_64\ncompiler=gcc\ncompiler.version=4.8\ncompiler.libcxx=libstdc++\nbuild_type=Release\n" > ~/.conan/profiles/release
fi
else
printf "[settings]\nos=Macos\narch=x86_64\ncompiler=apple-clang\ncompiler.version=9.0\ncompiler.libcxx=libstdc++\nbuild_type=Release\n" > ~/.conan/profiles/release
printf "[settings]\nos=Macos\narch=x86_64\ncompiler=apple-clang\ncompiler.version=9.0\ncompiler.libcxx=libc++\nbuild_type=Release\n" > ~/.conan/profiles/release
fi

@ -19,10 +19,5 @@ cmake ${CMAKE_OPTIONS} -DCMAKE_INSTALL_PREFIX=install ..
make -j2
make tests
make install
# Only run unit tests on Linux for the moment
# TODO: Check what is happening on Mac
if [[ "$(uname -s)" == 'Linux' ]]; then
cd bin
./unit_tests
fi
cd bin
./unit_tests

Loading…
Cancel
Save