Attached Integration test to Ref test

r9-pena · Jul 22, 2021 · 158ecab · 158ecab
1 parent a31c10b
commit 158ecab
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 17 deletions.
diff --git a/.github/actions/Dockerfile b/.github/actions/Dockerfile
@@ -10,5 +10,3 @@ USER fprime
 
 # Code file to execute when the docker container starts up (`entrypoint.sh`)
 ENTRYPOINT ["/entrypoint.sh"]
-
-
diff --git a/ci/master.bash b/ci/master.bash
@@ -42,7 +42,7 @@ export TEST_TYPE="${TEST}"
 
 #### NEEDED ENVIRONMENT ####
 export FPRIME_DIR="$(cd ${SCRIPT_DIR}/..; pwd)"
-export LOG_DIR="${FPRIME_DIR}/ci-logs-$(date +"%Y-%m-%dT%H%M%S")"
+export LOG_DIR="${FPRIME_DIR}/ci-${TEST}-logs-$(date +"%Y-%m-%dT%H%M%S")"
 mkdir -p "${LOG_DIR}"
 
 ####

diff --git a/ci/tests/Ref.bash b/ci/tests/Ref.bash
@@ -25,4 +25,7 @@ do
     fputil_action "${FPUTIL_DEPLOYS}" "${target}"
     END="$(date +%s)"
     echo "$[${END} - ${START}]"
-done
+done
+
+echo -e "${BLUE}Testing ${INT_DEPLOYS} against integration tests${NOCOLOR}"
+integration_test "${INT_DEPLOYS}"
diff --git a/ci/tests/fputil.bash b/ci/tests/fputil.bash
@@ -26,12 +26,12 @@ function fputil_action {
         PLATFORM=""
 
         # Generate is only needed when it isn't being tested
-        if [[ "${TARGET}" != "generate" ]] && [[ "${TEST_TYPE}" != "20-fputil" ]]
-        then
-            echo "[INFO] Generating build cache before ${DEPLOYMENT//\//_} '${TARGET}' execution"
-            fprime-util "generate" ${PLATFORM} ${CMAKE_EXTRA_SETTINGS} > "${LOG_DIR}/${DEPLOYMENT//\//_}_pregen.out.log" 2> "${LOG_DIR}/${DEPLOYMENT//\//_}_pregen.err.log" \
-                || fail_and_stop "Failed to generate before ${DEPLOYMENT//\//_} '${TARGET}' execution"
-        fi
+        # if [[ "${TARGET}" != "generate" ]] && [[ "${TEST_TYPE}" != "20-fputil" ]]
+        # then
+        #     echo "[INFO] Generating build cache before ${DEPLOYMENT//\//_} '${TARGET}' execution"
+        #     fprime-util "generate" ${PLATFORM} ${CMAKE_EXTRA_SETTINGS} > "${LOG_DIR}/${DEPLOYMENT//\//_}_pregen.out.log" 2> "${LOG_DIR}/${DEPLOYMENT//\//_}_pregen.err.log" \
+        #         || fail_and_stop "Failed to generate before ${DEPLOYMENT//\//_} '${TARGET}' execution"
+        # fi
         cd "${WORKDIR}"
         if [[ "${TARGET}" != "generate" ]] && [[ "${TARGET}" != "generate --ut" ]]
         then
@@ -57,12 +57,9 @@ function integration_test {
     export WORKDIR="${1}"
     export ROOTDIR="${WORKDIR}/build-artifacts"
 
-    echo "${WORKDIR}"
-    echo "${ROOTDIR}"
-    if [[ "${TEST_TYPE}" != "30-fputil" ]]
-    then
-        fputil_action "${WORKDIR}" "build" || fail_and_stop "Failed to build before integration test"
-    fi
+    # fprime-util generate
+    # fprime-util "${WORKDIR}" "build" || fail_and_stop "Failed to build before integration test"
+
     (
         mkdir -p "${LOG_DIR}/gds-logs"
         # Start the GDS layer and give it time to run
@@ -77,7 +74,7 @@ function integration_test {
             --leak-check=full \
             --show-leak-kinds=all \
             --track-origins=yes \
-            --log-file=${LOG_DIR}/gds-logs/valgrind.log \
+            # --log-file=${LOG_DIR}/gds-logs/valgrind.log \
             ${ROOTDIR}/*/bin/Ref -a 127.0.0.1 -p 50000 1>${LOG_DIR}/gds-logs/Ref.stdout.log 2>${LOG_DIR}/gds-logs/Ref.stderr.log &
         VALGRIND_PID=$!