From 26326c529765e8d998963049a7d355570e584ca0 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Wed, 25 Jun 2025 01:47:22 +0200 Subject: [PATCH] build: stubgss tidy-ups (in tests) - cmake: avoid running clang-tidy twice. - autotools: do not pass curl/libtest-specific macros. Also: - autotools: drop `CFLAG_CURL_SYMBOL_HIDING` from libtests. Unused since 09437d8cd46ebc5fefbb578bc11d0ffc522de2f0 #14695 Closes #17738 --- tests/libtest/CMakeLists.txt | 2 +- tests/libtest/Makefile.am | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/tests/libtest/CMakeLists.txt b/tests/libtest/CMakeLists.txt index bf7f9476f1..c55b6ccb31 100644 --- a/tests/libtest/CMakeLists.txt +++ b/tests/libtest/CMakeLists.txt @@ -60,7 +60,7 @@ set_property(TARGET ${BUNDLE} APPEND PROPERTY COMPILE_DEFINITIONS "${CURL_DEBUG_ set_property(TARGET ${BUNDLE} APPEND PROPERTY COMPILE_DEFINITIONS "CURL_NO_OLDIES" "CURL_DISABLE_DEPRECATION") set_target_properties(${BUNDLE} PROPERTIES OUTPUT_NAME "${BUNDLE}" PROJECT_LABEL "Test ${BUNDLE}" UNITY_BUILD OFF C_CLANG_TIDY "") -curl_clang_tidy_tests(${BUNDLE} ${FIRSTFILES} ${UTILS} ${TESTFILES} ${STUB_GSS}) +curl_clang_tidy_tests(${BUNDLE} ${FIRSTFILES} ${UTILS} ${TESTFILES}) if(HAVE_GSSAPI AND UNIX) add_library(stubgss SHARED EXCLUDE_FROM_ALL ${STUB_GSS}) diff --git a/tests/libtest/Makefile.am b/tests/libtest/Makefile.am index 6b83ff8f2a..64515c7b4c 100644 --- a/tests/libtest/Makefile.am +++ b/tests/libtest/Makefile.am @@ -45,8 +45,6 @@ include Makefile.inc EXTRA_DIST = CMakeLists.txt .checksrc $(FIRSTFILES) $(UTILS) $(TESTFILES) \ test307.pl test610.pl test613.pl test1013.pl test1022.pl mk-lib1521.pl -CFLAG_CURL_SYMBOL_HIDING = @CFLAG_CURL_SYMBOL_HIDING@ - CFLAGS += @CURL_CFLAG_EXTRAS@ # Prevent LIBS from being used for all link targets @@ -72,7 +70,7 @@ AM_CFLAGS = if BUILD_STUB_GSS noinst_LTLIBRARIES += libstubgss.la -libstubgss_la_CPPFLAGS = $(AM_CPPFLAGS) +libstubgss_la_CPPFLAGS = libstubgss_la_LDFLAGS = $(AM_LDFLAGS) -avoid-version -rpath /nowhere if CURL_LT_SHLIB_USE_NO_UNDEFINED libstubgss_la_LDFLAGS += -no-undefined