diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2018-10-21 21:00:37 +0100 |
|---|---|---|
| committer | Edward Thomson <ethomson@edwardthomson.com> | 2018-11-28 15:10:02 +0000 |
| commit | de60d9b4c643217abaf75664aa0a4ff55f7dd9b5 (patch) | |
| tree | b3fe1372e1b70c423d5fb756ae69171d42081491 /ci | |
| parent | c07ff4cb9e8bb8be6d5ad07cdfc3b7d92e88e741 (diff) | |
| download | libgit2-de60d9b4c643217abaf75664aa0a4ff55f7dd9b5.tar.gz | |
tests: PROXY_URL is more accurately PROXY_HOST
Change the `GITTEST_REMOTE_PROXY_URL` environment variable to be
`GITTEST_REMOTE_PROXY_HOST`, since it is a host:port combination, not an
actual URL. (We cannot use a URL here since we may want to include the
username:password combination in the constructed URL.)
Diffstat (limited to 'ci')
| -rw-r--r-- | ci/test.ps1 | 2 | ||||
| -rwxr-xr-x | ci/test.sh | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ci/test.ps1 b/ci/test.ps1 index fdfa1fec7..ed09633d9 100644 --- a/ci/test.ps1 +++ b/ci/test.ps1 @@ -65,7 +65,7 @@ if (-not $Env:SKIP_PROXY_TESTS) { Write-Host "Running proxy tests" Write-Host "" - $Env:GITTEST_REMOTE_PROXY_URL="localhost:8080" + $Env:GITTEST_REMOTE_PROXY_HOST="localhost:8080" $Env:GITTEST_REMOTE_PROXY_USER="foo" $Env:GITTEST_REMOTE_PROXY_PASS="bar" diff --git a/ci/test.sh b/ci/test.sh index 10c4d84b5..f3bf19012 100755 --- a/ci/test.sh +++ b/ci/test.sh @@ -164,11 +164,11 @@ if [ -z "$SKIP_PROXY_TESTS" ]; then echo "Running proxy tests" echo "" - export GITTEST_REMOTE_PROXY_URL="localhost:8080" + export GITTEST_REMOTE_PROXY_HOST="localhost:8080" export GITTEST_REMOTE_PROXY_USER="foo" export GITTEST_REMOTE_PROXY_PASS="bar" run_test proxy - unset GITTEST_REMOTE_PROXY_URL + unset GITTEST_REMOTE_PROXY_HOST unset GITTEST_REMOTE_PROXY_USER unset GITTEST_REMOTE_PROXY_PASS fi |