@@ -11,10 +11,10 @@ NC='\033[0m'
1111BOLD=' \033[1;39m'
1212
1313RET=0
14- SQL_TEST_RET=0
15- MEM_LEAK_EXECUTED=$?
16- MEM_LEAK_RET=0
17- CONFLICT_RET=0
14+ SQL_TEST_RET=1
15+ MEM_LEAK_EXECUTED=false
16+ MEM_LEAK_RET=1
17+ CONFLICT_RET=1
1818
1919# ################################################
2020# Running SQL parser tests.
@@ -25,7 +25,6 @@ SQL_TEST_RET=$?
2525if [ $SQL_TEST_RET -eq 0 ]; then
2626 printf " ${GREEN} SQL parser tests succeeded!${NC} \n"
2727else
28- RET=1
2928 printf " ${RED} SQL parser tests failed!${NC} \n"
3029fi
3130
@@ -40,12 +39,9 @@ if [[ "$unamestr" == 'Linux' ]]; then
4039
4140 MEM_LEAK_EXECUTED=true
4241 MEM_LEAK_RET=$?
43- RET=1
4442
4543 if [ $MEM_LEAK_RET -eq 0 ]; then
4644 printf " ${GREEN} Memory leak check succeeded!${NC} \n"
47- MEM_LEAK_RET=0
48- RET=0
4945 elif [ $MEM_LEAK_RET -eq 200 ]; then
5046 printf " ${RED} Memory leak check failed!${NC} \n"
5147 elif [ $MEM_LEAK_RET -eq 127 ]; then
@@ -55,7 +51,6 @@ if [[ "$unamestr" == 'Linux' ]]; then
5551 fi
5652else
5753 printf " \n${YELLOW} Skipping memory leak checks (can only be executed on Linux)!${NC} \n"
58- MEM_LEAK_EXECUTED=false
5954fi
6055
6156# ################################################
@@ -68,7 +63,6 @@ CONFLICT_RET=$?
6863if [ $CONFLICT_RET -eq 0 ]; then
6964 printf " ${GREEN} Conflict check succeeded!${NC} \n"
7065else
71- RET=1
7266 printf " ${RED} Conflict check failed!${NC} \n"
7367fi
7468
8680if [ $CONFLICT_RET -eq 0 ]; then printf " Grammar Conflict Check: ${GREEN} Success${BOLD} \n" ;
8781else printf " Grammar Conflict Check: ${RED} Failure${BOLD} \n" ; fi
8882
89- if [ $RET -ne 0 ]; then printf " ${RED} Some tests failed!${NC} \n"
90- elif [ " $MEM_LEAK_EXECUTED " = false ]; then printf " ${YELLOW} Some tests were skipped!${NC} \n"
91- else printf " ${GREEN} All tests passed!${NC} \n"
83+ if [[ $SQL_TEST_RET -ne 0 || $CONFLICT_RET -ne 0 ]]; then
84+ RET=1
85+ fi
86+
87+ if [ $MEM_LEAK_RET -ne 0 ]; then
88+ if [ " $MEM_LEAK_EXECUTED " = true ]; then
89+ RET=1
90+ fi
91+ fi
92+
93+
94+ if [ $RET -eq 0 ]; then
95+ if [ " $MEM_LEAK_EXECUTED " = true ]; then printf " ${GREEN} All tests passed!${NC} \n"
96+ else printf " ${YELLOW} Some tests were skipped!${NC} \n"
97+ fi
98+ else printf " ${RED} Some tests failed!${NC} \n"
9299fi
93100printf " ${NC} ----------------------------------\n"
94101
0 commit comments