diff --git a/.travis.yml b/.travis.yml index 1ffb66f3..1a325614 100644 --- a/.travis.yml +++ b/.travis.yml @@ -81,6 +81,7 @@ script: local project_path="$1" local sail_cmake_path="$2" local build_type="$3" + local old_dir="$PWD" echo echo "External Windows Test '$project_path' '$build_type'" @@ -94,6 +95,8 @@ script: fail_on_error cmake -A x64 -DSAIL_DEV=ON -DCMAKE_PREFIX_PATH="$sail_cmake_path" .. fail_on_error cmake --build . --config $build_type + + cd "$old_dir" } test_external_unix() @@ -101,6 +104,7 @@ script: local project_path="$1" local build_type="$2" local exe="$3" + local old_dir="$PWD" echo echo "External Unix Test '$project_path' '$build_type'" @@ -115,6 +119,8 @@ script: fail_on_error cmake -DSAIL_DEV=ON -DCMAKE_BUILD_TYPE="$build_type" .. fail_on_error cmake --build . --verbose fail_on_error "$exe" + + cd "$old_dir" } build() @@ -146,6 +152,8 @@ script: test_external_windows "tests/external/link/c" "$CMAKE_INSTALL_PREFIX/lib/cmake" "$CMAKE_BUILD_TYPE" test_external_windows "tests/external/link/c++" "$CMAKE_INSTALL_PREFIX/lib/cmake" "$CMAKE_BUILD_TYPE" + + rm -rf "$CMAKE_INSTALL_PREFIX" ;; osx | linux) CMAKE_INSTALL_PREFIX="/usr/local" @@ -161,11 +169,14 @@ script: cd tests fail_on_error ctest --verbose + cd - fail_on_error "$CMAKE_INSTALL_PREFIX/bin/sail" --version test_external_unix "tests/external/link/c" "$CMAKE_BUILD_TYPE" "./external-c-api-link" test_external_unix "tests/external/link/c++" "$CMAKE_BUILD_TYPE" "./external-c++-api-link" + + xargs rm -v < install_manifest.txt ;; esac }