diff --git a/ci/tests/20-fputil.bash b/ci/tests/20-fputil.bash index f77b5cb582..28b2f7586b 100755 --- a/ci/tests/20-fputil.bash +++ b/ci/tests/20-fputil.bash @@ -18,6 +18,7 @@ do continue fi # Check if RPI or Ref deployment to disable FRAMEWORK UTS + # RP - These are the only 2 deployments used by the 20-fputil CI if [[ "${deployment}" == */RPI ]] || [[ "${deployment}" == */Ref ]] then export CMAKE_EXTRA_SETTINGS="${CMAKE_EXTRA_SETTINGS} -DFPRIME_ENABLE_FRAMEWORK_UTS=OFF" @@ -26,11 +27,13 @@ do export CHECK_TARGET_PLATFORM="native" for target in "${FPUTIL_TARGETS[@]}" do + # RP - This if stmt is only used for the 20-fputil CI if [[ "${TEST_TYPE}" != "20-fputil" ]] || [[ "${target}" == "generate" ]] then rm -rf "${deployment}/build-fprime-automatic-"* fi fputil_action "${deployment}" "${target}" + # RP - This if stmt is only used for the 20-fputil CI if [[ "${TEST_TYPE}" != "20-fputil" ]] then "${SCRIPT_DIR}/clean.bash" || fail_and_stop "Cleaning repository" diff --git a/ci/tests/fputil.bash b/ci/tests/fputil.bash index 2dd4838420..adb3ecf16e 100755 --- a/ci/tests/fputil.bash +++ b/ci/tests/fputil.bash @@ -56,7 +56,7 @@ function integration_test { export SLEEP_TIME="10" export WORKDIR="${1}" export ROOTDIR="${WORKDIR}/build-artifacts" - if [[ "${TEST_TYPE}" != "QUICK" ]] + if [[ "${TEST_TYPE}" != "30-fputil" ]] then fputil_action "${WORKDIR}" "build" || fail_and_stop "Failed to build before integration test" fi