diff options
| author | Hans Nilsson <[email protected]> | 2018-01-29 12:34:25 +0100 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2018-01-29 12:34:25 +0100 |
| commit | db9e04d0f4337a2b32376a41275ecedfe0258c1f (patch) | |
| tree | 6587c001ea3d27da3f88a30c0a70f5e997a96507 /lib/ssh/test/ssh_compat_SUITE_data/build_scripts/create-ssl-image | |
| parent | 80de6b173fb12cfdb0b511531a4b0d2ad33d4098 (diff) | |
| parent | 0169c569052824dd95c045f977219d9022339cc7 (diff) | |
| download | otp-db9e04d0f4337a2b32376a41275ecedfe0258c1f.tar.gz otp-db9e04d0f4337a2b32376a41275ecedfe0258c1f.tar.bz2 otp-db9e04d0f4337a2b32376a41275ecedfe0258c1f.zip | |
Merge branch 'hans/ssh/docker_compat_tests/OTP-14194' into maint
* hans/ssh/docker_compat_tests/OTP-14194:
ssh: Disable test failing if docker command exists
ssh: Skeleton of build scripts for DropBear image
ssh: Can use DropBear SSH dockers
ssh: Remove duplicate test cases from ssh_to_openssh_SUITE
ssh: Add more tests
ssh: Change the default list of ssh and ssl version images
ssh: Enable building openssh 0.9.8[a-l]
ssh: Add LibreSSL to compat tests
Diffstat (limited to 'lib/ssh/test/ssh_compat_SUITE_data/build_scripts/create-ssl-image')
| -rwxr-xr-x | lib/ssh/test/ssh_compat_SUITE_data/build_scripts/create-ssl-image | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/lib/ssh/test/ssh_compat_SUITE_data/build_scripts/create-ssl-image b/lib/ssh/test/ssh_compat_SUITE_data/build_scripts/create-ssl-image index 66f8358b8a..4ab2a8bddc 100755 --- a/lib/ssh/test/ssh_compat_SUITE_data/build_scripts/create-ssl-image +++ b/lib/ssh/test/ssh_compat_SUITE_data/build_scripts/create-ssl-image @@ -23,6 +23,16 @@ case "$1" in ;; esac +case $1$2 in + openssl0.9.8[a-l]) + CONFIG_FLAGS=no-asm + ;; + *) + CONFIG_FLAGS= + ;; +esac + + # This way of fetching the tar-file separate from the docker commands makes # http-proxy handling way easier. The wget command handles the $https_proxy # variable while the docker command must have /etc/docker/something changed @@ -42,10 +52,10 @@ cat - > TempDockerFile <<EOF WORKDIR ${FAM}-${VER} - RUN ./config --prefix=/buildroot/ssl + RUN ./config --prefix=/buildroot/ssl ${CONFIG_FLAGS} RUN make - RUN make install + RUN make install_sw RUN echo Built ${FAM}-${VER} EOF |