Add Moonshot-COI and Moonshot-APC attributes

[freeradius.git] / Makefile

diff --git a/Makefile b/Makefile
index defab5d..7689102 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@
 # Version:     $Id$
 #
 
-$(if $(wildcard Make.inc),,$(error Missing 'Make.inc' Run './configure [options]' and retry")) 
+$(if $(wildcard Make.inc),,$(error Missing 'Make.inc' Run './configure [options]' and retry))
 
 include Make.inc
 
@@ -24,16 +24,46 @@ export DESTDIR := $(R)
 # And over-ride all of the other magic.
 include scripts/boiler.mk
 
-test: build.raddb ${BUILD_DIR}/bin/radiusd ${BUILD_DIR}/bin/radclient tests.unit tests.keywords
+#
+#  To work around OpenSSL issues with travis.
+#
+.PHONY:
+raddb/test.conf:
+       @echo 'security {' >> $@
+       @echo '        allow_vulnerable_openssl = yes' >> $@
+       @echo '}' >> $@
+       @echo '$$INCLUDE radiusd.conf' >> $@
+
+#
+#  Run "radiusd -C", looking for errors.
+#
+# Only redirect STDOUT, which should contain details of why the test failed.
+# Don't molest STDERR as this may be used to receive output from a debugger.
+$(BUILD_DIR)/tests/radiusd-c: raddb/test.conf ${BUILD_DIR}/bin/radiusd | build.raddb
        @$(MAKE) -C raddb/certs
-       @./build/make/jlibtool --mode=execute ./build/bin/radiusd -XCMd ./raddb -n debug -D ./share
+       @printf "radiusd -C... "
+       @if ! ./build/make/jlibtool --mode=execute ./build/bin/radiusd -XCMd ./raddb -D ./share -n test > $(BUILD_DIR)/tests/radiusd.config.log; then \
+               @rm -f raddb/test.conf; \
+               cat $(BUILD_DIR)/tests/radiusd.config.log; \
+               echo "fail"; \
+               exit 1; \
+       fi
+       @rm -f raddb/test.conf
+       @echo "ok"
+       @touch $@
+
+test: ${BUILD_DIR}/bin/radiusd ${BUILD_DIR}/bin/radclient tests.unit tests.keywords $(BUILD_DIR)/tests/radiusd-c | build.raddb
        @$(MAKE) -C src/tests tests
 
 #  Tests specifically for Travis.  We do a LOT more than just
 #  the above tests
 ifneq "$(findstring travis,${prefix})" ""
-travis-test: test
+travis-test: raddb/test.conf test
+       @./build/make/jlibtool --mode=execute ./build/bin/radiusd -xxxv -n test
+       @rm -f raddb/test.conf
        @$(MAKE) install
+       @perl -p -i -e 's/allow_vulnerable_openssl = no/allow_vulnerable_openssl = yes/' ${raddbdir}/radiusd.conf
+       @${sbindir}/radiusd -XC
        @$(MAKE) deb
 endif
 
@@ -184,7 +214,7 @@ CONFIGURE_ARGS         := $(shell head -10 config.log | grep '^  \$$' | sed 's/^..../
 src/%all.mk: src/%all.mk.in src/%configure
        @echo CONFIGURE $(dir $@)
        @rm -f ./config.cache $(dir $<)/config.cache
-       @cd $(dir $<) && CPPFLAGS=$(DARWIN_CFLAGS) CFLAGS=$(DARWIN_CFLAGS) ./configure $(CONFIGURE_ARGS)
+       @cd $(dir $<) && ./configure $(CONFIGURE_ARGS)
 endif
 
 .PHONY: check-includes
@@ -200,7 +230,7 @@ TAGS:
 #
 .PHONY: certs
 certs:
-       @cd raddb/certs && $(MAKE)
+       @$(MAKE) -C raddb/certs
 
 ######################################################################
 #
@@ -211,13 +241,13 @@ certs:
 #
 ######################################################################
 freeradius-server-$(RADIUSD_VERSION_STRING).tar.gz: .git
-       git archive --format=tar --prefix=freeradius-server-$(RADIUSD_VERSION_STRING)/ release_branch_3.0.0 | gzip > $@
+       git archive --format=tar --prefix=freeradius-server-$(RADIUSD_VERSION_STRING)/ v3.0.x | gzip > $@
 
 freeradius-server-$(RADIUSD_VERSION_STRING).tar.gz.sig: freeradius-server-$(RADIUSD_VERSION_STRING).tar.gz
        gpg --default-key aland@freeradius.org -b $<
 
 freeradius-server-$(RADIUSD_VERSION_STRING).tar.bz2: .git
-       git archive --format=tar --prefix=freeradius-server-$(RADIUSD_VERSION_STRING)/ release_branch_3.0.0 | bzip2 > $@
+       git archive --format=tar --prefix=freeradius-server-$(RADIUSD_VERSION_STRING)/ v3.0.x | bzip2 > $@
 
 freeradius-server-$(RADIUSD_VERSION_STRING).tar.bz2.sig: freeradius-server-$(RADIUSD_VERSION_STRING).tar.bz2
        gpg --default-key aland@freeradius.org -b $<
@@ -268,3 +298,12 @@ deb:
 warnings:
        @(make clean all 2>&1) | egrep -v '^/|deprecated|^In file included|: In function|   from |^HEADER|^CC|^LINK' > warnings.txt
        @wc -l warnings.txt
+
+#
+#  Ensure we're using tabs in the configuration files,
+#  and remove trailing whitespace in source files.
+#
+.PHONY: whitespace
+whitespace:
+       @for x in $$(git ls-files raddb/ src/); do unexpand $$x > $$x.bak; cp $$x.bak $$x; rm -f $$x.bak;done
+       @perl -p -i -e 'trim' $$(git ls-files src/)