Skip to content

Commit

Permalink
Test nasa#12
Browse files Browse the repository at this point in the history
  • Loading branch information
r9-pena committed Jul 15, 2021
1 parent cd1f0c8 commit 326bef6
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
3 changes: 3 additions & 0 deletions ci/tests/20-fputil.bash
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion ci/tests/fputil.bash
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 326bef6

Please sign in to comment.