Skip to content

Commit 17f5626

Browse files
committed
Revert test changes
1 parent e126f42 commit 17f5626

File tree

1 file changed

+9
-17
lines changed

1 file changed

+9
-17
lines changed

ci/pre-commit/doxygen.sh

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,7 @@ fi
2424
function version { echo "$@" | awk -F. '{ printf("%d%03d%03d%03d\n", $1,$2,$3,$4); }'; }
2525

2626
# Doxygen supported version 1.8.20 to 1.9.1
27-
doxygen --version
2827
DOXYGEN_VERSION=$(doxygen --version)
29-
echo "$DOXYGEN_VERSION"
3028
if [ $(version "$DOXYGEN_VERSION") -lt $(version "1.8.20") ] || [ $(version $DOXYGEN_VERSION) -gt $(version "1.9.1") ]; then
3129
echo -e "Warning: Unsupported Doxygen version $DOXYGEN_VERSION"
3230
echo -e "Expecting Doxygen version from 1.8.20 to 1.9.1"
@@ -36,22 +34,16 @@ fi
3634
# Run doxygen, ignore missing tag files error
3735
TAG_ERROR1="error: Tag file '.*.tag' does not exist or is not a file. Skipping it..."
3836
TAG_ERROR2="error: cannot open tag file .*.tag for writing"
39-
40-
cd doxygen
41-
echo "--- Doxyfile ---"
42-
cat Doxyfile
43-
echo "----------------"
44-
doxygen
45-
37+
DOXYGEN_STDERR=`cd doxygen && { cat Doxyfile ; echo QUIET = YES; echo GENERATE_HTML = NO; } | doxygen - 2>&1 | sed "/\($TAG_ERROR1\|$TAG_ERROR2\)/d"`
4638
RETVAL=$?
4739

48-
#if [ "$RETVAL" != "0" ] || [ ! -z "$DOXYGEN_STDERR" ]; then
49-
echo -e "\n>>>> FAILED: doxygen check; begin output\n"
50-
echo -e "$DOXYGEN_STDERR"
51-
echo -e "\n>>>> FAILED: doxygen check; end output\n"
52-
# RETVAL=1 #because return value is not generated by doxygen 1.8.17
53-
#else
54-
# echo -e "\n>>>> PASSED: doxygen check\n"
55-
#fi
40+
if [ "$RETVAL" != "0" ] || [ ! -z "$DOXYGEN_STDERR" ]; then
41+
echo -e "\n>>>> FAILED: doxygen check; begin output\n"
42+
echo -e "$DOXYGEN_STDERR"
43+
echo -e "\n>>>> FAILED: doxygen check; end output\n"
44+
RETVAL=1 #because return value is not generated by doxygen 1.8.17
45+
else
46+
echo -e "\n>>>> PASSED: doxygen check\n"
47+
fi
5648

5749
exit $RETVAL

0 commit comments

Comments
 (0)