Unverified Commit c77162e4 authored by teor's avatar teor
Browse files

Merge remote-tracking branch 'tor-github/pr/1360' into maint-0.3.5

parents 27965f1e da5c8277
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -83,8 +83,8 @@ build_script:
             # 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 "V=1 make -j2"
            Execute-Bash "V=1 make -j2 install"
            Execute-Bash "V=1 make -k -j2"
            Execute-Bash "V=1 make -k -j2 install"
     }

test_script:
@@ -95,7 +95,7 @@ test_script:
            $buildpath = @("C:\msys64\${env:compiler_path}\bin") + $oldpath
            $env:Path = $buildpath -join ';'
            Set-Location "${env:build}"
            Execute-Bash "VERBOSE=1 make -j2 check"
            Execute-Bash "VERBOSE=1 make -k -j2 check"
    }

on_finish:
+4 −2
Original line number Diff line number Diff line
@@ -20,8 +20,10 @@ os:
## Instead, we list each job under matrix: include:
env:
  global:
    ## The Travis CI environment allows us two cores, so let's use both.
    - MAKEFLAGS="-j 2"
    ## The Travis CI environment allows us two cores, so let's use both.  Also,
    ## 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
    ## Also known as --enable-fragile-hardening in 0.3.0.3-alpha and later
    - HARDENING_OPTIONS="--enable-expensive-hardening"
+4 −0
Original line number Diff line number Diff line
  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 −0
Original line number Diff line number Diff line
  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.