lib/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-04-20 12:07:51 +03:00
Code

programs/test/metatest indirectly includes library/common.h

Browse Source 
Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
This commit is contained in:
Gilles Peskine 2023-11-03 19:16:56 +01:00
parent 4bc873f0a1
commit a1023e2bd6
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
programs/Makefile
View File

@ -416,7 +416,7 @@ endif
test/metatest$(EXEXT): test/metatest.c $(DEP) test/metatest$(EXEXT): test/metatest.c $(DEP)
echo " CC test/metatest.c" echo " CC test/metatest.c"
$(CC) $(LOCAL_CFLAGS) $(CFLAGS) test/metatest.c $(LOCAL_LDFLAGS) $(LDFLAGS) -o $@ $(CC) $(LOCAL_CFLAGS) $(CFLAGS) -I ../library test/metatest.c $(LOCAL_LDFLAGS) $(LDFLAGS) -o $@
test/query_config.o: test/query_config.c test/query_config.h $(DEP) test/query_config.o: test/query_config.c test/query_config.h $(DEP)
echo " CC test/query_config.c" echo " CC test/query_config.c"

1
programs/test/CMakeLists.txt
View File

@ -73,6 +73,7 @@ foreach(exe IN LISTS executables_libs executables_mbedcrypto)
add_executable(${exe} ${exe}.c $<TARGET_OBJECTS:mbedtls_test> add_executable(${exe} ${exe}.c $<TARGET_OBJECTS:mbedtls_test>
${extra_sources}) ${extra_sources})
target_include_directories(${exe} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../../tests/include) target_include_directories(${exe} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../../tests/include)
target_include_directories(${exe} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../../library)
if(exe STREQUAL "query_compile_time_config") if(exe STREQUAL "query_compile_time_config")
target_include_directories(${exe} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}) target_include_directories(${exe} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
endif() endif()

5
scripts/generate_visualc_files.pl
View File

@ -144,6 +144,7 @@ sub gen_app {
my $guid = gen_app_guid( $path ); my $guid = gen_app_guid( $path );
$path =~ s!/!\\!g; $path =~ s!/!\\!g;
(my $appname = $path) =~ s/.*\\//; (my $appname = $path) =~ s/.*\\//;
my $is_test_app = ($path =~ m/^test\\/);
my $srcs = "<ClCompile Include=\"..\\..\\programs\\$path.c\" \/>"; my $srcs = "<ClCompile Include=\"..\\..\\programs\\$path.c\" \/>";
if( $appname eq "ssl_client2" or $appname eq "ssl_server2" or if( $appname eq "ssl_client2" or $appname eq "ssl_server2" or
@ -158,7 +159,9 @@ sub gen_app {
$content =~ s/<SOURCES>/$srcs/g; $content =~ s/<SOURCES>/$srcs/g;
$content =~ s/<APPNAME>/$appname/g; $content =~ s/<APPNAME>/$appname/g;
$content =~ s/<GUID>/$guid/g; $content =~ s/<GUID>/$guid/g;
$content =~ s/INCLUDE_DIRECTORIES\n/$include_directories/g; $content =~ s/INCLUDE_DIRECTORIES\n/($is_test_app ?
$library_include_directories :
$include_directories)/ge;
content_to_file( $content, "$dir/$appname.$ext" ); content_to_file( $content, "$dir/$appname.$ext" );
} }