yuzu-emu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2024-11-22 12:15:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

build: Add top-level mbedtls_test target

Browse Source 
In preparation of linking common test objects in programs,
add the top-level mbedtls_test target.

This target consists of the common test objects.

It is necessary to declare it at the top-level as both
tests and programs will depend on it and it is necessary
to synchronize the compilation of those objects for tests
and programs for the case of parallel building.

Signed-off-by: Ronald Cron <ronald.cron@arm.com>
This commit is contained in:
Ronald Cron 2020-06-19 11:27:26 +02:00
parent bfd45f1f11
commit ddaf99c9d4
4 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
CMakeLists.txt
View File

@ -238,6 +238,15 @@ list(APPEND libs ${thirdparty_lib})
add_subdirectory(library) add_subdirectory(library)
if(ENABLE_TESTING OR ENABLE_PROGRAMS)
file(GLOB MBEDTLS_TEST_FILES ${CMAKE_CURRENT_SOURCE_DIR}/tests/src/*.c)
add_library(mbedtls_test OBJECT ${MBEDTLS_TEST_FILES})
target_include_directories(mbedtls_test
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/tests/include
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/library)
endif()
if(ENABLE_PROGRAMS) if(ENABLE_PROGRAMS)
add_subdirectory(programs) add_subdirectory(programs)
endif() endif()

7
Makefile
View File

@ -10,15 +10,18 @@ all: programs tests
no_test: programs no_test: programs
programs: lib programs: lib mbedtls_test
$(MAKE) -C programs $(MAKE) -C programs
lib: lib:
$(MAKE) -C library $(MAKE) -C library
tests: lib tests: lib mbedtls_test
$(MAKE) -C tests $(MAKE) -C tests
mbedtls_test:
$(MAKE) -C tests mbedtls_test
ifndef WINDOWS ifndef WINDOWS
install: no_test install: no_test
mkdir -p $(DESTDIR)/include/mbedtls mkdir -p $(DESTDIR)/include/mbedtls

7
tests/CMakeLists.txt
View File

@ -69,13 +69,6 @@ if(MSVC)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /WX-") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /WX-")
endif(MSVC) endif(MSVC)
file(GLOB MBEDTLS_TEST_FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/*.c)
add_library(mbedtls_test OBJECT ${MBEDTLS_TEST_FILES})
target_include_directories(mbedtls_test
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../include
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../library)
add_test_suite(aes aes.cbc) add_test_suite(aes aes.cbc)
add_test_suite(aes aes.cfb) add_test_suite(aes aes.cfb)
add_test_suite(aes aes.ecb) add_test_suite(aes aes.ecb)

2
tests/Makefile
View File

@ -79,6 +79,8 @@ $(MBEDLIBS):
MBEDTLS_TEST_OBJS=$(patsubst %.c,%.o,$(wildcard src/*.c)) MBEDTLS_TEST_OBJS=$(patsubst %.c,%.o,$(wildcard src/*.c))
mbedtls_test: $(MBEDTLS_TEST_OBJS)
# Rule to compile common test C files in src folder # Rule to compile common test C files in src folder
src/%.o : src/%.c src/%.o : src/%.c
echo " CC $<" echo " CC $<"