Skip to content

Commit f51a94c

Browse files
CharanCharan
authored andcommitted
Added review comments to add extra checks for make and make clean
1 parent 9dedbce commit f51a94c

File tree

1 file changed

+27
-18
lines changed

1 file changed

+27
-18
lines changed

test/assignment2/assignment-test.sh

Lines changed: 27 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -8,37 +8,46 @@ SOURCE_DIR=$(realpath ${SCRIPTS_DIR}/../../../)
88
pushd ${SOURCE_DIR}/finder-app
99

1010
make clean
11-
make
12-
13-
CURRENT_DIR=$(pwd)
14-
EXECUTABLE="$CURRENT_DIR/writer"
11+
if [ -x "./writer" ]; then
12+
echo "ERROR: make clean does not clean up the writer executable in ${SCRIPTS_DIR}"
13+
exit 1
14+
fi
1515

16-
if [ -x "$EXECUTABLE" ]; then
16+
make
17+
if [ -x "./writer" ]; then
1718
./writer
18-
rc=$?
19-
if [ $rc -ne 1 ]; then
20-
add_validate_error "writer should have exited with return value 1 if no parameters were specified"
21-
fi
22-
23-
./writer "$filedir"
24-
rc=$?
25-
if [ $rc -ne 1 ]; then
26-
add_validate_error "writer should have exited with return value 1 if write string is not specified"
27-
fi
28-
echo "Performing make clean"
19+
rc=$?
20+
if [ $rc -ne 1 ]; then
21+
add_validate_error "writer should have exited with return value 1 if no parameters were specified"
22+
fi
23+
24+
./writer "$filedir"
25+
rc=$?
26+
if [ $rc -ne 1 ]; then
27+
add_validate_error "writer should have exited with return value 1 if write string is not specified"
28+
fi
29+
echo "Performing make clean"
2930
make clean
3031
else
31-
echo "Makefile Error, Failed to generate writer executable."
32+
echo "Makefile Error, Failed to generate writer executable in ${SCRIPTS_DIR}."
3233
exit 1
3334
fi
3435

3536
./finder-test.sh
37+
38+
# Check if writer executable exists after finder-test.sh
39+
if [ ! -x "./writer" ]; then
40+
echo "ERROR: ./writer executable does not exist after executing finder-test.sh in ${SCRIPTS_DIR}. Make sure finder-test.sh includes the necessary make step."
41+
exit 1
42+
fi
43+
3644
rc=$?
3745
if [ $rc -ne 0 ]; then
38-
add_validate_error "finder-test.sh execution failed with return code $rc"
46+
add_validate_error "finder-test.sh execution failed with return code $rc"
3947
fi
4048

4149
if [ ! -z "${validate_error}" ]; then
4250
echo "Validation failed with error list ${validate_error}"
4351
exit 1
4452
fi
53+

0 commit comments

Comments
 (0)