]> git.ipfire.org Git - thirdparty/freeradius-server.git/commitdiff
Just call the 'exit N' due to Make don't expand it correctly
authorJorge Pereira <jpereira@freeradius.org>
Mon, 7 Oct 2019 16:19:14 +0000 (13:19 -0300)
committerJorge Pereira <jpereira@freeradius.org>
Mon, 7 Oct 2019 22:24:26 +0000 (19:24 -0300)
The Make don't expand the '${ret}' inside the macros.

src/tests/radiusd.mk

index 03575052d4044026c49f3469bbf542ac49d0174d..05760f713421b6bdb20b1477b3a93b916bce5d6c 100644 (file)
@@ -43,7 +43,6 @@ define RADIUSD_SERVICE
 $(TEST).radiusd_kill: | ${2}
        @echo "Clean up ${2}/radiusd.pid"
        ${Q}if [ -f ${2}/radiusd.pid ]; then \
-               ret=0; \
                if ! ps `cat ${2}/radiusd.pid` >/dev/null 2>&1; then \
                    rm -f ${1}; \
                    echo "FreeRADIUS terminated during test called by $(TEST).radiusd_kill"; \
@@ -52,12 +51,12 @@ $(TEST).radiusd_kill: | ${2}
                    echo "--------------------------------------------------"; \
                    tail -n 40 "${2}/gdb.log"; \
                    echo "Last entries in server log (${2}/gdb.log):"; \
-                   ret=1; \
+                   exit 1; \
                fi; \
                if ! kill -TERM `cat ${2}/radiusd.pid` >/dev/null 2>&1; then \
-                       ret=1; \
+                       exit 1; \
                fi; \
-               exit ${ret}; \
+               exit 0; \
        fi
 
 #