The branch master has been updated via 51d058cd9418508b48ec44dce6087ce730173832 (commit) from 4f6aeabd65bf13795823f4a6f4a03c815e9d096f (commit)
- Log ----------------------------------------------------------------- commit 51d058cd9418508b48ec44dce6087ce730173832 Author: Richard Levitte <levi...@openssl.org> Date: Thu Nov 26 21:21:02 2020 +0100 appveyor.yml: clarify conditions for building the plain configuration The "plain" configuration is only meant to be built for an '[extended tests]' commit, or on the master branch. This isn't at all clear from the scripts, and furthermore, we "skip" the plain configuration by running the OpenSSL configuration script... and then nothing more. Instead, we use AppVeyor configuration issues to specify when and when not to build the "plain" configuration, and leave it to the scripts to do the right thing using only $env:EXTENDED_TESTS. Fixes #7958 Reviewed-by: Tomas Mraz <to...@openssl.org> Reviewed-by: Paul Dale <pa...@openssl.org> (Merged from https://github.com/openssl/openssl/pull/13537) ----------------------------------------------------------------------- Summary of changes: appveyor.yml | 47 +++++++++++++++++++++++++++-------------------- 1 file changed, 27 insertions(+), 20 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index f0dfc7f5ba..20d81c1b12 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -12,9 +12,29 @@ environment: configuration: - shared - - plain - minimal +for: + - + only_commits: + message: /\[extended tests\]/ + configuration: + - shared + - plain + - minimal + environment: + EXTENDED_TESTS: yes + - + branches: + only: + - master + configuration: + - shared + - plain + - minimal + environment: + EXTENDED_TESTS: yes + before_build: - ps: >- Install-Module VSSetup -Scope CurrentUser @@ -42,12 +62,6 @@ before_build: - perl ..\Configure %TARGET% no-makedepend %CONFIG_OPTS% - perl configdata.pm --dump - cd .. - - ps: >- - If (-not $env:APPVEYOR_PULL_REQUEST_NUMBER` - -or (&git log -1 $env:APPVEYOR_PULL_REQUEST_HEAD_COMMIT | - Select-String "\[extended tests\]") ) { - $env:EXTENDED_TESTS="yes" - } - ps: >- If ($env:BUILDONLY -or $env:MAKEVERBOSE) { $env:NMAKE="nmake" @@ -59,24 +73,17 @@ before_build: build_script: - cd _build - - ps: >- - If ($env:Configuration -Match "shared" -or $env:EXTENDED_TESTS) { - cmd /c "%NMAKE% build_all_generated 2>&1" - # Unfortunately, CL=/MP would not have parallelizing effect - cmd /c "%NMAKE% PERL=no-perl 2>&1" - } + - "%NMAKE% build_all_generated" + - "%NMAKE% PERL=no-perl" - cd .. test_script: - cd _build - ps: >- - If ($env:Configuration -Match "shared" -or $env:EXTENDED_TESTS) { - # Unfortunately, HARNESS_JOBS=4 would not have parallelizing effect - if ($env:EXTENDED_TESTS) { - cmd /c "%NMAKE% test HARNESS_VERBOSE_FAILURE=yes 2>&1" - } Else { - cmd /c "%NMAKE% test HARNESS_VERBOSE_FAILURE=yes TESTS=-test_fuzz 2>&1" - } + if ($env:EXTENDED_TESTS) { + cmd /c "%NMAKE% test VERBOSE_FAILURE=yes 2>&1" + } Else { + cmd /c "%NMAKE% test VERBOSE_FAILURE=yes TESTS=-test_fuzz 2>&1" } - ps: >- if ($env:EXTENDED_TESTS) {