mirrors/zint-barcode-generator
1
0
Fork 0
mirror of https://git.code.sf.net/p/zint/code synced 2024-09-19 07:18:55 -04:00
Code Issues Projects Releases Packages Wiki Activity

testUtilDataPath: use CMAKE_CURRENT_SOURCE_DIR env to work out-of-tree (#234)

Browse source
This commit is contained in:
gitlost 2021-07-07 14:47:25 +01:00
parent 7379acd4a4
commit 4d9aa96453
2 changed files with 24 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
backend/tests/testcommon.c
View file

@ -1288,18 +1288,32 @@ int testUtilDataPath(char *buffer, int buffer_size, const char *subdir, const ch
int filename_len = filename ? (int) strlen(filename) : 0;
char *s, *s2;
int len;
char *cmake_src_dir;
#ifdef _WIN32
int i;
#endif
if (getcwd(buffer, buffer_size) == NULL) {
fprintf(stderr, "testUtilDataPath: getcwd NULL buffer_size %d\n", buffer_size);
return 0;
if ((cmake_src_dir = getenv("CMAKE_CURRENT_SOURCE_DIR")) != NULL) {
len = (int) strlen(cmake_src_dir);
if (len <= 0 || len >= buffer_size) {
fprintf(stderr, "testUtilDataPath: warning CMAKE_CURRENT_SOURCE_DIR len %d, ignoring\n", len);
cmake_src_dir = NULL;
} else {
strcpy(buffer, cmake_src_dir);
}
}
len = (int) strlen(buffer);
if (len <= 0) {
fprintf(stderr, "testUtilDataPath: strlen <= 0\n");
return 0;
if (cmake_src_dir == NULL) {
if (getcwd(buffer, buffer_size) == NULL) {
fprintf(stderr, "testUtilDataPath: getcwd NULL buffer_size %d\n", buffer_size);
return 0;
}
len = (int) strlen(buffer);
if (len <= 0) {
fprintf(stderr, "testUtilDataPath: strlen <= 0\n");
return 0;
}
}
#ifdef _WIN32
for (i = 0; i < len; i++) {
@ -1336,7 +1350,7 @@ int testUtilDataPath(char *buffer, int buffer_size, const char *subdir, const ch
*s = '\0';
len = s - buffer;
}
if ((s = strrchr(buffer, '/')) != NULL) { // Remove "build" dir
if (cmake_src_dir == NULL && (s = strrchr(buffer, '/')) != NULL) { // Remove "build" dir
*s = '\0';
len = s - buffer;
}

2
cmake/zint_add_test.cmake
View file

@ -8,9 +8,11 @@ macro(zint_add_test test_name test_command)
add_executable(${test_command} ${test_command}.c)
target_link_libraries(${test_command} testcommon ${ADDITIONAL_LIBS})
add_test(${test_name} ${test_command})
set_tests_properties(${test_name} PROPERTIES ENVIRONMENT "CMAKE_CURRENT_SOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR}")
if(ZINT_STATIC)
add_executable(${test_command}-static ${test_command}.c)
target_link_libraries(${test_command}-static testcommon-static ${ADDITIONAL_LIBS})
add_test(${test_name}-static ${test_command}-static)
set_tests_properties(${test_name}-static PROPERTIES ENVIRONMENT "CMAKE_CURRENT_SOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR}")
endif()
endmacro()