diff options
| author | Darren Tucker <dtucker@dtucker.net> | 2023-03-26 05:49:43 +0200 |
|---|---|---|
| committer | Darren Tucker <dtucker@dtucker.net> | 2023-03-26 05:49:43 +0200 |
| commit | 4922ac3be8a996780ef3dc220411da2e27c29d9c (patch) | |
| tree | 185d3043994d58ddaa18ec766d7a61fc8f043336 /.github | |
| parent | Specify test target if we build without OpenSSL. (diff) | |
| download | openssh-4922ac3be8a996780ef3dc220411da2e27c29d9c.tar.xz openssh-4922ac3be8a996780ef3dc220411da2e27c29d9c.zip | |
Split libcrypto and other config flags.
This should allow the automatic OpenSSL version selection in the tests
to work better.
Diffstat (limited to '.github')
| -rwxr-xr-x | .github/configs | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/.github/configs b/.github/configs index 963d806f1..7aeeddb8a 100755 --- a/.github/configs +++ b/.github/configs @@ -81,7 +81,8 @@ case "$config" in CFLAGS="-fsanitize=memory -fsanitize-memory-track-origins -fno-omit-frame-pointer" LDFLAGS="-fsanitize=memory" CPPFLAGS='-Dchroot=chdir -Dexplicit_bzero=bzero -DMSAN_OPTIONS=\"log_path='$SANLOGS'/msan.log\"' - CONFIGFLAGS="--without-openssl --without-zlib --without-shadow" + CONFIGFLAGS="--without-zlib --without-shadow" + LIBCRYPTOFLAGS="--without-openssl" TEST_TARGET="t-exec" ;; *-sanitize-undefined) @@ -244,7 +245,8 @@ case "${TARGET_HOST}" in SKIP_LTESTS="forwarding multiplex proxy-connect hostkey-agent agent-ptrace" ;; minix3) - LIBCRYPTOFLAGS="--without-openssl --disable-security-key" + CONFIGFLAGS="${CONFIGFLAGS} --disable-security-key" + LIBCRYPTOFLAGS="--without-openssl" # Minix does not have a loopback interface so we have to skip any # test that relies on one. # Also, Minix seems to be very limited in the number of select() @@ -268,7 +270,8 @@ case "${TARGET_HOST}" in CONFIGFLAGS="${CONFIGFLAGS} --without-hardening --disable-security-key" ;; openwrt-*) - CONFIGFLAGS="${CONFIGFLAGS} --without-openssl --without-zlib" + CONFIGFLAGS="${CONFIGFLAGS} --without-zlib" + LIBCRYPTOFLAGS="--without-openssl" TEST_TARGET="t-exec" ;; sol10|sol11) |