epics/ci-scripts
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

travis: error on setup file not found

Browse Source
This commit is contained in:
Ralph Lange
2019-11-13 14:40:56 +01:00
parent d1fd40b52a
commit a673f94d8c
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
travis/utils.sh
+8 -1
View File
@@ -20,15 +20,22 @@ fold_end() {
source_set() { source_set() {
local set_file=$1 local set_file=$1
local set_dir local set_dir
local found=0
for set_dir in ${SETUP_DIRS} for set_dir in ${SETUP_DIRS}
do do
if [ -e $set_dir/$set_file.set ] if [ -e $set_dir/$set_file.set ]
then then
echo "Loading setup file $set_dir/$set_file.set" echo "Loading setup file $set_dir/$set_file.set"
. $set_dir/$set_file.set . $set_dir/$set_file.set
found=1
break break
fi fi
done done
if [ $found -eq 0 ]
then
echo "Setup file $set_file.set does not exist in SETUP_DIRS search path ($SETUP_DIRS)"
[ "$UTILS_UNITTEST" ] || exit 1
fi
} }
# update_release_local(varname, place) # update_release_local(varname, place)
@@ -130,7 +137,7 @@ add_dependency() {
modules_to_compile="${modules_to_compile} $location/$dirname-$TAG" modules_to_compile="${modules_to_compile} $location/$dirname-$TAG"
# run hook # run hook
eval hook="\${${DEP}_HOOK}" eval hook="\${${DEP}_HOOK}"
if [ ! -z "$hook" ] if [ "$hook" ]
then then
if [ -x "$curdir/$hook" ] if [ -x "$curdir/$hook" ]
then then