curl/curl
1
1
Fork 0
mirror of https://github.com/curl/curl.git synced 2025-09-07 21:05:09 +03:00
Code Issues Packages Projects Releases Wiki Activity

tests/libtest: merge MEMPTR into UTILS

Browse Source 
Follow-up to ee06673296 #17628

Closes #17633
This commit is contained in:
Viktor Szakats 2025-06-16 08:51:52 +02:00
parent 253e1e94c6
commit bb9955c865
No known key found for this signature in database
GPG Key ID: B5ABD165E2AEF201
3 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/libtest/CMakeLists.txt
View File

@ -22,7 +22,7 @@
# #
########################################################################### ###########################################################################
# Get BUNDLE, BUNDLE_SRC, FIRSTFILES, UTILS, MEMPTR, CURLX_SRCS, TESTFILES variables # Get BUNDLE, BUNDLE_SRC, FIRSTFILES, UTILS, CURLX_SRCS, TESTFILES variables
curl_transform_makefile_inc("Makefile.inc" "${CMAKE_CURRENT_BINARY_DIR}/Makefile.inc.cmake") curl_transform_makefile_inc("Makefile.inc" "${CMAKE_CURRENT_BINARY_DIR}/Makefile.inc.cmake")
include("${CMAKE_CURRENT_BINARY_DIR}/Makefile.inc.cmake") include("${CMAKE_CURRENT_BINARY_DIR}/Makefile.inc.cmake")
@ -42,11 +42,11 @@ add_custom_command(
add_custom_command( add_custom_command(
OUTPUT "${BUNDLE_SRC}" OUTPUT "${BUNDLE_SRC}"
COMMAND ${PERL_EXECUTABLE} "${PROJECT_SOURCE_DIR}/scripts/mk-unity.pl" COMMAND ${PERL_EXECUTABLE} "${PROJECT_SOURCE_DIR}/scripts/mk-unity.pl"
--include ${UTILS} ${MEMPTR} ${_bundle_extra} --test ${TESTFILES} "lib1521.c" --include ${UTILS} ${_bundle_extra} --test ${TESTFILES} "lib1521.c"
${CURL_MK_UNITY_OPTION} --srcdir "${CMAKE_CURRENT_SOURCE_DIR}" > "${BUNDLE_SRC}" ${CURL_MK_UNITY_OPTION} --srcdir "${CMAKE_CURRENT_SOURCE_DIR}" > "${BUNDLE_SRC}"
DEPENDS DEPENDS
"${PROJECT_SOURCE_DIR}/scripts/mk-unity.pl" "${CMAKE_CURRENT_SOURCE_DIR}/Makefile.inc" "${PROJECT_SOURCE_DIR}/scripts/mk-unity.pl" "${CMAKE_CURRENT_SOURCE_DIR}/Makefile.inc"
${FIRSTFILES} ${UTILS} ${MEMPTR} ${_bundle_extra} ${TESTFILES} "lib1521.c" ${FIRSTFILES} ${UTILS} ${_bundle_extra} ${TESTFILES} "lib1521.c"
VERBATIM) VERBATIM)
add_executable(libtests EXCLUDE_FROM_ALL "${BUNDLE_SRC}") add_executable(libtests EXCLUDE_FROM_ALL "${BUNDLE_SRC}")

8
tests/libtest/Makefile.am
View File

@ -40,10 +40,10 @@ AM_CPPFLAGS = -I$(top_srcdir)/include \
-I$(top_srcdir)/tests/libtest \ -I$(top_srcdir)/tests/libtest \
-I$(top_srcdir)/tests/unit -I$(top_srcdir)/tests/unit
# Get BUNDLE, BUNDLE_SRC, FIRSTFILES, UTILS, MEMPTR, CURLX_SRCS, TESTFILES variables # Get BUNDLE, BUNDLE_SRC, FIRSTFILES, UTILS, CURLX_SRCS, TESTFILES variables
include Makefile.inc include Makefile.inc
EXTRA_DIST = CMakeLists.txt .checksrc $(FIRSTFILES) $(UTILS) $(MEMPTR) $(TESTFILES) \ EXTRA_DIST = CMakeLists.txt .checksrc $(FIRSTFILES) $(UTILS) $(TESTFILES) \
test307.pl test610.pl test613.pl test1013.pl test1022.pl mk-lib1521.pl test307.pl test610.pl test613.pl test1013.pl test1022.pl mk-lib1521.pl
CFLAG_CURL_SYMBOL_HIDING = @CFLAG_CURL_SYMBOL_HIDING@ CFLAG_CURL_SYMBOL_HIDING = @CFLAG_CURL_SYMBOL_HIDING@
@ -94,8 +94,8 @@ else
# These are part of the libcurl static lib. Add them here when linking shared. # These are part of the libcurl static lib. Add them here when linking shared.
bundle_extra += $(CURLX_SRCS) bundle_extra += $(CURLX_SRCS)
endif endif
$(BUNDLE_SRC): $(top_srcdir)/scripts/mk-unity.pl Makefile.inc $(FIRSTFILES) $(UTILS) $(MEMPTR) $(bundle_extra) $(TESTFILES) lib1521.c $(BUNDLE_SRC): $(top_srcdir)/scripts/mk-unity.pl Makefile.inc $(FIRSTFILES) $(UTILS) $(bundle_extra) $(TESTFILES) lib1521.c
@PERL@ $(top_srcdir)/scripts/mk-unity.pl --include $(UTILS) $(MEMPTR) $(bundle_extra) --test $(TESTFILES) lib1521.c > $(BUNDLE_SRC) @PERL@ $(top_srcdir)/scripts/mk-unity.pl --include $(UTILS) $(bundle_extra) --test $(TESTFILES) lib1521.c > $(BUNDLE_SRC)
noinst_PROGRAMS = $(BUNDLE) noinst_PROGRAMS = $(BUNDLE)
nodist_libtests_SOURCES = $(BUNDLE_SRC) nodist_libtests_SOURCES = $(BUNDLE_SRC)

4
tests/libtest/Makefile.inc
View File

@ -30,9 +30,7 @@ BUNDLE_SRC = libtests.c
FIRSTFILES = first.c first.h FIRSTFILES = first.c first.h
# Common files used by test programs # Common files used by test programs
UTILS = testutil.c testutil.h testtrace.c testtrace.h test.h ../unit/curlcheck.h UTILS = memptr.c testutil.c testutil.h testtrace.c testtrace.h test.h ../unit/curlcheck.h
MEMPTR = memptr.c
CURLX_SRCS = \ CURLX_SRCS = \
../../lib/curlx/warnless.c \ ../../lib/curlx/warnless.c \