mirror of https://github.com/openssl/openssl
Simplify AppVeyor configuration
Adjust the stuff we are building and testing in various configurations to trim the run time a little bit. Reviewed-by: Paul Dale <pauli@openssl.org> (Merged from https://github.com/openssl/openssl/pull/15087)
This commit is contained in:
parent
535130c39d
commit
39da327294
19
appveyor.yml
19
appveyor.yml
|
@ -15,15 +15,6 @@ configuration:
|
||||||
- minimal
|
- minimal
|
||||||
|
|
||||||
for:
|
for:
|
||||||
-
|
|
||||||
only_commits:
|
|
||||||
message: /\[extended tests\]/
|
|
||||||
configuration:
|
|
||||||
- shared
|
|
||||||
- plain
|
|
||||||
- minimal
|
|
||||||
environment:
|
|
||||||
EXTENDED_TESTS: yes
|
|
||||||
-
|
-
|
||||||
branches:
|
branches:
|
||||||
only:
|
only:
|
||||||
|
@ -32,8 +23,6 @@ for:
|
||||||
- shared
|
- shared
|
||||||
- plain
|
- plain
|
||||||
- minimal
|
- minimal
|
||||||
environment:
|
|
||||||
EXTENDED_TESTS: yes
|
|
||||||
|
|
||||||
before_build:
|
before_build:
|
||||||
- ps: >-
|
- ps: >-
|
||||||
|
@ -50,11 +39,11 @@ before_build:
|
||||||
}
|
}
|
||||||
- ps: >-
|
- ps: >-
|
||||||
If ($env:Configuration -Match "shared") {
|
If ($env:Configuration -Match "shared") {
|
||||||
$env:CONFIG_OPTS=""
|
$env:CONFIG_OPTS="enable-fips"
|
||||||
} ElseIf ($env:Configuration -Match "minimal") {
|
} ElseIf ($env:Configuration -Match "minimal") {
|
||||||
$env:CONFIG_OPTS="no-bulk no-asm -DOPENSSL_SMALL_FOOTPRINT"
|
$env:CONFIG_OPTS="no-bulk no-asm -DOPENSSL_SMALL_FOOTPRINT"
|
||||||
} Else {
|
} Else {
|
||||||
$env:CONFIG_OPTS="no-shared"
|
$env:CONFIG_OPTS="no-fips no-shared"
|
||||||
}
|
}
|
||||||
- call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" %VCVARS_PLATFORM%
|
- call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" %VCVARS_PLATFORM%
|
||||||
- mkdir _build
|
- mkdir _build
|
||||||
|
@ -80,13 +69,13 @@ build_script:
|
||||||
test_script:
|
test_script:
|
||||||
- cd _build
|
- cd _build
|
||||||
- ps: >-
|
- ps: >-
|
||||||
if ($env:EXTENDED_TESTS) {
|
if ($env:Configuration -Match "plain") {
|
||||||
cmd /c "%NMAKE% test VERBOSE_FAILURE=yes 2>&1"
|
cmd /c "%NMAKE% test VERBOSE_FAILURE=yes 2>&1"
|
||||||
} Else {
|
} Else {
|
||||||
cmd /c "%NMAKE% test VERBOSE_FAILURE=yes TESTS=-test_fuzz 2>&1"
|
cmd /c "%NMAKE% test VERBOSE_FAILURE=yes TESTS=-test_fuzz 2>&1"
|
||||||
}
|
}
|
||||||
- ps: >-
|
- ps: >-
|
||||||
if ($env:EXTENDED_TESTS) {
|
if ($env:Configuration -Match "shared") {
|
||||||
mkdir ..\_install
|
mkdir ..\_install
|
||||||
cmd /c "%NMAKE% install DESTDIR=..\_install 2>&1"
|
cmd /c "%NMAKE% install DESTDIR=..\_install 2>&1"
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue