mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-23 20:03:31 +01:00
Merge remote-tracking branch 'tor-github/pr/1360' into maint-0.3.5
This commit is contained in:
commit
c77162e4e9
@ -83,8 +83,8 @@ build_script:
|
|||||||
# configure its flags. liblzma just works.
|
# configure its flags. liblzma just works.
|
||||||
#>
|
#>
|
||||||
Execute-Bash "ZSTD_CFLAGS='-L/${env:compiler_path}/include' ZSTD_LIBS='-L/${env:compiler_path}/lib -lzstd' ../configure --prefix=/${env:compiler_path} --build=${env:target} --host=${env:target} --with-openssl-dir=/${env:compiler_path} --disable-asciidoc --enable-fatal-warnings ${env:hardening}"
|
Execute-Bash "ZSTD_CFLAGS='-L/${env:compiler_path}/include' ZSTD_LIBS='-L/${env:compiler_path}/lib -lzstd' ../configure --prefix=/${env:compiler_path} --build=${env:target} --host=${env:target} --with-openssl-dir=/${env:compiler_path} --disable-asciidoc --enable-fatal-warnings ${env:hardening}"
|
||||||
Execute-Bash "V=1 make -j2"
|
Execute-Bash "V=1 make -k -j2"
|
||||||
Execute-Bash "V=1 make -j2 install"
|
Execute-Bash "V=1 make -k -j2 install"
|
||||||
}
|
}
|
||||||
|
|
||||||
test_script:
|
test_script:
|
||||||
@ -95,7 +95,7 @@ test_script:
|
|||||||
$buildpath = @("C:\msys64\${env:compiler_path}\bin") + $oldpath
|
$buildpath = @("C:\msys64\${env:compiler_path}\bin") + $oldpath
|
||||||
$env:Path = $buildpath -join ';'
|
$env:Path = $buildpath -join ';'
|
||||||
Set-Location "${env:build}"
|
Set-Location "${env:build}"
|
||||||
Execute-Bash "VERBOSE=1 make -j2 check"
|
Execute-Bash "VERBOSE=1 make -k -j2 check"
|
||||||
}
|
}
|
||||||
|
|
||||||
on_finish:
|
on_finish:
|
||||||
|
@ -20,8 +20,10 @@ os:
|
|||||||
## Instead, we list each job under matrix: include:
|
## Instead, we list each job under matrix: include:
|
||||||
env:
|
env:
|
||||||
global:
|
global:
|
||||||
## The Travis CI environment allows us two cores, so let's use both.
|
## The Travis CI environment allows us two cores, so let's use both. Also,
|
||||||
- MAKEFLAGS="-j 2"
|
## let's use the "-k" flag so that we get all of the compilation failures,
|
||||||
|
## not just the first one.
|
||||||
|
- MAKEFLAGS="-k -j 2"
|
||||||
## We turn on hardening by default
|
## We turn on hardening by default
|
||||||
## Also known as --enable-fragile-hardening in 0.3.0.3-alpha and later
|
## Also known as --enable-fragile-hardening in 0.3.0.3-alpha and later
|
||||||
- HARDENING_OPTIONS="--enable-expensive-hardening"
|
- HARDENING_OPTIONS="--enable-expensive-hardening"
|
||||||
|
4
changes/ticket31372_appveyor
Normal file
4
changes/ticket31372_appveyor
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
o Minor features (continuous integration):
|
||||||
|
- When building on Appveyor, pass the "-k" flag to make, so that
|
||||||
|
we are informed of all compilation failures, not just the first
|
||||||
|
one or two. Closes part of ticket 31372.
|
4
changes/ticket31372_travis
Normal file
4
changes/ticket31372_travis
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
o Minor features (continuous integration):
|
||||||
|
- When building on Travis, pass the "-k" flag to make, so that
|
||||||
|
we are informed of all compilation failures, not just the first
|
||||||
|
one or two. Closes part of ticket 31372.
|
Loading…
Reference in New Issue
Block a user