Skip to content

Commit

Permalink
build: sync common files from github_organization_management repository
Browse files Browse the repository at this point in the history
  • Loading branch information
metworkbot committed Oct 12, 2023
1 parent 9359eff commit 43a48be
Showing 1 changed file with 11 additions and 10 deletions.
21 changes: 11 additions & 10 deletions integration_tests/0096_system_extra_dependencies/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,26 +15,27 @@ RET=0


cd "${MFEXT_HOME}" || exit 1
cd opt
for layer in `ls`; do
cd "${layer}"
cd opt || exit 1
for layer in *; do
[[ -e $layer ]] || break
cd "${layer}" || exit 1
if test -f .mfextaddon; then
addon="mfextaddon_"`cat .mfextaddon`
addon="mfextaddon_"$(cat .mfextaddon)
if test "mfextaddon_php" = "${addon}"; then
echo
echo "=== System extra dependencies layer ${layer} ==="
echo
current_layer=`cat .layerapi2_label`
DEPS1=$(layer_wrapper --layers=${current_layer} -- external_dependencies.sh |awk -F '/' '{print $NF}' |xargs)
current_layer=$(cat .layerapi2_label)
DEPS1=$(layer_wrapper --layers="${current_layer}" -- external_dependencies.sh |awk -F '/' '{print $NF}' |xargs)
# We don t consider libraries available in the layer (they should not be here, probably a LD_LIBRARY_PATH issue)
DEPS2=""
for lib in ${DEPS1}; do
found=$(find . -name ${lib} -print)
found=$(find . -name "${lib}" -print)
if test "${found}" == ""; then
DEPS2="${DEPS2} ${lib}"
fi
done
echo "--- external dependencies ---" ${DEPS2}
echo "--- external dependencies ---" "${DEPS2}"
for DEP in ${DEPS2}; do
FOUND=0
for OK_DEP in ${OK_DEPS}; do
Expand All @@ -53,11 +54,11 @@ for layer in `ls`; do
echo
RET=1
done
DEPS3=$(layer_wrapper --layers=${current_layer} -- external_dependencies_not_found.sh |xargs)
DEPS3=$(layer_wrapper --layers="${current_layer}" -- external_dependencies_not_found.sh |xargs)
# We don t consider libraries available in the layer (they should not be here, probably a LD_LIBRARY_PATH issue)
DEPS4=""
for lib in ${DEPS3}; do
found=$(find . -name ${lib} -print)
found=$(find . -name "${lib}" -print)
if test "${found}" == ""; then
DEPS4="${DEPS4} ${lib}"
fi
Expand Down

0 comments on commit 43a48be

Please sign in to comment.