Skip to content

Commit

Permalink
Including variables and make call to main log
Browse files Browse the repository at this point in the history
  • Loading branch information
judovana committed Dec 9, 2024
1 parent eceae01 commit c58bfe0
Showing 1 changed file with 12 additions and 4 deletions.
16 changes: 12 additions & 4 deletions external/run_all.sh
Original file line number Diff line number Diff line change
Expand Up @@ -84,15 +84,15 @@ function runExternalTest() {
if [ -e "${fileName}-PASSED" ] || [ -e "${fileName}-FAILED" ] || [ -e "${fileName}-ERROR" ] ; then
if [ "${SKIP_FINISHED}" == "true" ] ; then
echo "${fileName}-PASSED/FAILED/ERROR exists and SKIP_FINISHED is ${SKIP_FINISHED}, skipping "
return
return 0
fi
fi
rm -f "${fileName}"
echo "cat ${fileName}* for details"
set -x
export TEST_JDK_HOME="${jdk}"
export TEST_JDK_HOME="${jdk}" ;
export EXTRA_DOCKER_ARGS="-v $TEST_JDK_HOME:/opt/java/openjdk" ;
export BUILD_LIST=external/${externalTest} ;
export BUILD_LIST=external/${externalTest} ;
if [ "${image}" == "DEFAULT" ] ; then
unset EXTERNAL_AQA_IMAGE;
else
Expand All @@ -105,9 +105,17 @@ function runExternalTest() {
fi
SKIP_GET=true
cd TKG
echo "
export TEST_JDK_HOME="${TEST_JDK_HOME}"
export EXTRA_DOCKER_ARGS="${EXTRA_DOCKER_ARGS}" ;
export BUILD_LIST=${BUILD_LIST} ;
export EXTERNAL_AQA_IMAGE="${EXTERNAL_AQA_IMAGE:-}";
make compile
make "_${testCase}"
" > "${fileName}"
set -x
local cresult=0
make compile > "${fileName}" 2>&1 || cresult=$?
make compile >> "${fileName}" 2>&1 || cresult=$?
local rresult=0
make "_${testCase}" >> "${fileName}" 2>&1 || rresult=$?
set +x
Expand Down

0 comments on commit c58bfe0

Please sign in to comment.