diff --git a/.travis.yml b/.travis.yml index 8f91d702..9327173f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,6 +24,8 @@ before_install: fi - git --version - './get-swift.sh && export PATH="/tmp/swift/usr/bin:$PATH"' + - 'curl -sSf https://sh.rustup.rs | bash -s -- -y' + - export PATH="$HOME/.cargo/bin:$PATH" after_success: coveralls cache: directories: diff --git a/appveyor.yml b/appveyor.yml index ddb9af3c..772caf4d 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -11,6 +11,8 @@ install: - pip install tox virtualenv --upgrade - "mkdir -p C:\\Temp" - "SET TMPDIR=C:\\Temp" + - "curl -sSf https://sh.rustup.rs | bash -s -- -y" + - "SET PATH=%USERPROFILE%\\.cargo\\bin;%PATH%" # Not a C# project build: false diff --git a/tests/repository_test.py b/tests/repository_test.py index 6fece071..ba7be1fe 100644 --- a/tests/repository_test.py +++ b/tests/repository_test.py @@ -306,6 +306,8 @@ def test_additional_rust_cli_dependencies_installed( binaries = os.listdir(prefix.path( helpers.environment_dir(rust.ENVIRONMENT_DIR, 'default'), 'bin', )) + # normalize for windows + binaries = [os.path.splitext(binary)[0] for binary in binaries] assert 'shellharden' in binaries @@ -324,6 +326,8 @@ def test_additional_rust_lib_dependencies_installed( binaries = os.listdir(prefix.path( helpers.environment_dir(rust.ENVIRONMENT_DIR, 'default'), 'bin', )) + # normalize for windows + binaries = [os.path.splitext(binary)[0] for binary in binaries] assert 'rust-hello-world' in binaries assert 'shellharden' not in binaries