Fix small runAmbrosia script bug.

This commit is contained in:
Ryan Newton 2018-12-11 15:21:50 -08:00
Родитель 2c0fdded6d
Коммит de9b5b096d
3 изменённых файлов: 17 добавлений и 9 удалений

Просмотреть файл

@ -134,11 +134,12 @@ else
cd "$bindir/$dir"
mv -n * ..
done
echo
echo "After squishing, these files left behind / conflicting:"
echo "-------------------------------------------------------"
cd "$bindir"
find $secondary
echo "-------------------------------------------------------"
echo "Every one of these represents a risk of undefined behavior!"
echo
fi

Просмотреть файл

@ -93,10 +93,14 @@ _normal_cleanup() {
}
_unexpected_cleanup() {
trap '' EXIT # some shells will call EXIT after the INT handler
echo "$0: Exiting script abnormally! Cleaning up. ($1)"
_normal_cleanup
echo "$0: Done with cleanup."
trap '' EXIT # some shells will call EXIT after the INT handler
if [ ${$1:+defined} ];
then local WHCH="($1)"
else local WHCH=""
fi
echo "$0: Exiting script abnormally! Cleaning up. $WHCH"
_normal_cleanup
echo "$0: Done with cleanup."
}
trap _normal_cleanup EXIT

Просмотреть файл

@ -33,14 +33,17 @@ case $mode in
# When we are trying to run tests we don't really want the tarball:
DONT_BUILD_TARBALL=1 ./build_docker_images.sh
check_az_storage_and_bail
# APPLICATION 1: PTI
# ----------------------------------------
check_az_storage_and_bail
./Scripts/internal/run_linux_PTI_docker.sh
# Application 2: ...
# ----------------------------------------
# Application 2: NativeService
# ----------------------------------------
# docker --env AZURE_STORAGE_CONN_STRING="${AZURE_STORAGE_CONN_STRING}" --rm \
# ambrosia-nativeapp ./run_test_in_one_machine.sh
;;
nodocker)