Bug 1560593 - Check that BUILD_OPT is defined before testing its valu…

…e. r=jcj

Differential Revision: https://phabricator.services.mozilla.com/D43282

--HG--
extra : moz-landing-system : lando

tests/common/cleanup.sh

@@ -6,9 +6,9 @@
 
 
 if [ -z "${CLEANUP}" -o "${CLEANUP}" = "${SCRIPTNAME}" ]; then
-    if [ -z "${BUILD_OPT}" ] && [ "$OBJDIR" == "Debug"  ]; then
+    if [ -z "${BUILD_OPT}" ] && [ "${OBJDIR}" == "Debug"  ]; then
         BUILD_OPT=0;
-    elif [ -z "${BUILD_OPT}" ] && [ "$OBJDIR" == "Release" ]; then
+    elif [ -z "${BUILD_OPT}" ] && [ "${OBJDIR}" == "Release" ]; then
         BUILD_OPT=1;
     fi
 
@@ -60,7 +60,7 @@ if [ -z "${CLEANUP}" -o "${CLEANUP}" = "${SCRIPTNAME}" ]; then
     html "</BODY></HTML>"
     rm -f ${TEMPFILES} 2>/dev/null
     if [ ${FAILED_CNT} -gt 0 ] || [ ${ASAN_CNT} -gt 0 ] ||
-       ([ ${BUILD_OPT} -eq 1 ] && [ ${CORE_CNT} -gt 0 ]); then
+       ([ ${CORE_CNT} -gt 0 ] && [ -n "${BUILD_OPT}" ] && [ ${BUILD_OPT} -eq 1 ]); then
         exit 1
     fi