diff --git a/ci/master.bash b/ci/master.bash index d662657531..e828ef4066 100755 --- a/ci/master.bash +++ b/ci/master.bash @@ -8,11 +8,10 @@ export CTEST_OUTPUT_ON_FAILURE=1 export SCRIPT_DIR="$(dirname ${BASH_SOURCE})" . "${SCRIPT_DIR}/helpers.bash" -DEPLOYMENT="${@}" +export DEPLOYMENT="${@}" export TEST_TYPE="FULL" if [[ "${DEPLOYMENT}" == "Ref" ]] || [[ "${DEPLOYMENT}" == "RPI" ]] then - export DEPLOYMENT TEST="${SCRIPT_DIR}/tests/20-fputil.bash" export TEST_TYPE="20-fputil" elif [[ "${DEPLOYMENT}" == "30-ints" ]] diff --git a/ci/tests/20-fputil.bash b/ci/tests/20-fputil.bash index 10fee95a18..447d2fc042 100755 --- a/ci/tests/20-fputil.bash +++ b/ci/tests/20-fputil.bash @@ -28,9 +28,9 @@ do # RP - This if stmt is only used for the 20-fputil CI if [[ "${target}" == "generate" ]] then - rm -rf "${deployment}/build-fprime-automatic-"* + rm -rf "${DEPLOYMENT}/build-fprime-automatic-"* fi - fputil_action "${deployment}" "${target}" + fputil_action "${DEPLOYMENT}" "${target}" done # Loop over deployments and targets