nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 21:23:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'tor-github/pr/1363'

Browse Source
This commit is contained in:
David Goulet 2019-10-02 10:34:46 -04:00
commit 40be20d542
4 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.appveyor.yml
View File

@ -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:
@ -97,7 +97,7 @@ test_script:
Set-Location "${env:build}" Set-Location "${env:build}"
Copy-Item "C:/msys64/${env:compiler_path}/bin/libssp-0.dll" -Destination "${env:build}/src/test" Copy-Item "C:/msys64/${env:compiler_path}/bin/libssp-0.dll" -Destination "${env:build}/src/test"
Copy-Item "C:/msys64/${env:compiler_path}/bin/zlib1.dll" -Destination "${env:build}/src/test" Copy-Item "C:/msys64/${env:compiler_path}/bin/zlib1.dll" -Destination "${env:build}/src/test"
Execute-Bash "VERBOSE=1 make -j2 check" Execute-Bash "VERBOSE=1 make -k -j2 check"
} }
on_finish: on_finish:

6
.travis.yml
View File

@ -22,8 +22,10 @@ os:
## OS and compiler. ## OS and compiler.
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
View 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
View 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.