Commit b7678582 authored by Ian Jackson's avatar Ian Jackson
Browse files

tests/chutney/setup: Transfer changes from just-deleted code 

It turns out that the clone-and-hack in tests/chutney/arti-bench
was not identical to the original in tests/chutney/setup.

I diffed the two and preferred the version from arti-bench.
parent dcd74e7a

tests/chutney/setup

+3 −3
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ target="networks/$NETWORK" 
cd "$(git rev-parse --show-toplevel)"



if [ -z "${CHUTNEY_PATH}" ]; then

    # CHUTNEY_PATH isn't set; try cloning a local chutney.

    # CHUTNEY_PATH isn't set; try cloning or updating a local chutney.

    if [ -d chutney ]; then

	(cd ./chutney && git pull)

    else
@@ -61,7 +61,7 @@ if [ -z "${CHUTNEY_PATH}" ]; then 
    CHUTNEY_PATH="$(pwd)/chutney"

    export CHUTNEY_PATH

else

    # CHUTNEY_PATH is set; tell the user about that.

    # CHUTNEY_PATH is set; tell the user so.

    echo "CHUTNEY_PATH is ${CHUTNEY_PATH}; using your local copy of chutney."

fi
@@ -71,7 +71,7 @@ if [ ! -e "${CHUTNEY_PATH}/${target}" ]; then 
fi



"${CHUTNEY_PATH}/chutney" configure "${CHUTNEY_PATH}/$target"

"${CHUTNEY_PATH}"/chutney start "${CHUTNEY_PATH}/$target"

"${CHUTNEY_PATH}/chutney" start "${CHUTNEY_PATH}/$target"

CHUTNEY_START_TIME=180 "${CHUTNEY_PATH}"/chutney wait_for_bootstrap "${CHUTNEY_PATH}/$target"

"${CHUTNEY_PATH}"/chutney verify "${CHUTNEY_PATH}/$target"