Skip to content

Commit

Permalink
Improve portability of CI integration script (#1815)
Browse files Browse the repository at this point in the history
On Amazon Linux we install into lib64 and the Ninja executable is called ninja-build. Teach the integration script this.
  • Loading branch information
torben-hansen authored Aug 30, 2024
1 parent 3662fc1 commit 0f782c2
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion tests/ci/common_posix_setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ function aws_lc_build() {

echo "Building AWS-LC to ${BUILD_FOLDER} and installing to ${INSTALL_FOLDER} with CFlags "${@:4}""
${CMAKE_COMMAND} ${AWS_LC_DIR} -GNinja "-B${BUILD_FOLDER}" "-DCMAKE_INSTALL_PREFIX=${INSTALL_FOLDER}" "${@:4}"
ninja -C ${BUILD_FOLDER} install
${CMAKE_COMMAND} --build ${BUILD_FOLDER} -- install
ls -R ${INSTALL_FOLDER}
rm -rf "${BUILD_FOLDER:?}"/*
}
Expand Down
2 changes: 1 addition & 1 deletion tests/ci/integration/run_socat_integration.sh
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ mkdir -p "$AWS_LC_BUILD_FOLDER" "$AWS_LC_INSTALL_FOLDER"
git clone --depth 1 https://repo.or.cz/socat.git "$SOCAT_SRC"

aws_lc_build "$SRC_ROOT" "$AWS_LC_BUILD_FOLDER" "$AWS_LC_INSTALL_FOLDER" -DBUILD_SHARED_LIBS=1 -DBUILD_TESTING=0 -DCMAKE_BUILD_TYPE=RelWithDebInfo
export LD_LIBRARY_PATH="${AWS_LC_INSTALL_FOLDER}/lib/:${LD_LIBRARY_PATH:-}"
export LD_LIBRARY_PATH="${AWS_LC_INSTALL_FOLDER}/lib/:${AWS_LC_INSTALL_FOLDER}/lib64/:${LD_LIBRARY_PATH:-}"
build_and_test_socat

ldd "${SOCAT_SRC}/socat" | grep "${AWS_LC_INSTALL_FOLDER}/lib/libcrypto.so" || exit 1
Expand Down

0 comments on commit 0f782c2

Please sign in to comment.