From de8bf9112695763664912e340b265fa898188460 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 26 Aug 2024 12:41:52 +0200 Subject: Merging upstream version 3.2.5+dfsg. Signed-off-by: Daniel Baumann --- scripts/ci/eapol_test-build.sh | 3 +++ scripts/ci/package-test.mk | 1 + 2 files changed, 4 insertions(+) (limited to 'scripts/ci') diff --git a/scripts/ci/eapol_test-build.sh b/scripts/ci/eapol_test-build.sh index 42397e2..9e1dcd6 100755 --- a/scripts/ci/eapol_test-build.sh +++ b/scripts/ci/eapol_test-build.sh @@ -109,6 +109,9 @@ fi cp "$BUILD_CONF_FILE" "$WPA_SUPPLICANT_DIR/.config" +# Don't crash out on build warnings, some newer GCC versions are quite picky +sed -i -e 's/-Werror//' "${WPA_SUPPLICANT_DIR}/Makefile" + if ! make -C "${WPA_SUPPLICANT_DIR}" -j8 eapol_test 1>&2 || [ ! -e "${WPA_SUPPLICANT_DIR}/eapol_test" ]; then echo "Build error" 1>&2 if [ -z "${BUILD_DIR}" ]; then rm -rf "$TMP_BUILD_DIR"; fi diff --git a/scripts/ci/package-test.mk b/scripts/ci/package-test.mk index 417784b..b20e4d4 100644 --- a/scripts/ci/package-test.mk +++ b/scripts/ci/package-test.mk @@ -38,4 +38,5 @@ MAKE_ARGS := RADIUSD_BIN=$(RADIUSD_BIN) PORT=$(PORT) SECRET="$(SECRET)" DICT_PAT .PHONY: package-test package-test: + cp -r $(RADDB_PATH)/certs/* raddb/certs $(MAKE) -C src/tests $(MAKE_ARGS) tests.eap -- cgit v1.2.3