@@ -11,10 +11,10 @@ NC='\033[0m'
11
11
BOLD=' \033[1;39m'
12
12
13
13
RET=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
18
18
19
19
# ################################################
20
20
# Running SQL parser tests.
@@ -25,7 +25,6 @@ SQL_TEST_RET=$?
25
25
if [ $SQL_TEST_RET -eq 0 ]; then
26
26
printf " ${GREEN} SQL parser tests succeeded!${NC} \n"
27
27
else
28
- RET=1
29
28
printf " ${RED} SQL parser tests failed!${NC} \n"
30
29
fi
31
30
@@ -40,12 +39,9 @@ if [[ "$unamestr" == 'Linux' ]]; then
40
39
41
40
MEM_LEAK_EXECUTED=true
42
41
MEM_LEAK_RET=$?
43
- RET=1
44
42
45
43
if [ $MEM_LEAK_RET -eq 0 ]; then
46
44
printf " ${GREEN} Memory leak check succeeded!${NC} \n"
47
- MEM_LEAK_RET=0
48
- RET=0
49
45
elif [ $MEM_LEAK_RET -eq 200 ]; then
50
46
printf " ${RED} Memory leak check failed!${NC} \n"
51
47
elif [ $MEM_LEAK_RET -eq 127 ]; then
@@ -55,7 +51,6 @@ if [[ "$unamestr" == 'Linux' ]]; then
55
51
fi
56
52
else
57
53
printf " \n${YELLOW} Skipping memory leak checks (can only be executed on Linux)!${NC} \n"
58
- MEM_LEAK_EXECUTED=false
59
54
fi
60
55
61
56
# ################################################
@@ -68,7 +63,6 @@ CONFLICT_RET=$?
68
63
if [ $CONFLICT_RET -eq 0 ]; then
69
64
printf " ${GREEN} Conflict check succeeded!${NC} \n"
70
65
else
71
- RET=1
72
66
printf " ${RED} Conflict check failed!${NC} \n"
73
67
fi
74
68
86
80
if [ $CONFLICT_RET -eq 0 ]; then printf " Grammar Conflict Check: ${GREEN} Success${BOLD} \n" ;
87
81
else printf " Grammar Conflict Check: ${RED} Failure${BOLD} \n" ; fi
88
82
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"
92
99
fi
93
100
printf " ${NC} ----------------------------------\n"
94
101
0 commit comments