diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 9286c76b..01067ba5 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -21,6 +21,7 @@ Note that version 2.1 is the first version with release notes. Please see the co ### Bug fixes - Fixed an issue where enum variables min/max attributes were incorrectly handled as `int32`, instead of `int64`. - [BREAKING] Changed return types of `fmi3_import_get_enum_variable_min` and `fmi3_import_get_enum_variable_max` from `int` to `fmi3_int64_t`. +- For FMI3, added a missing trailing file separator to `resourcePath`. ### Improvements diff --git a/build/config/ubuntu64 b/build/config/ubuntu64 index d9d89fcf..33b6d5a8 100644 --- a/build/config/ubuntu64 +++ b/build/config/ubuntu64 @@ -20,7 +20,6 @@ CTEST_FLAGS_COMMON=--build-config $(BUILD_TYPE) --parallel $(shell nproc) --outp TEST_COMMAND=ctest $(CTEST_FLAGS_COMMON) --tests-regex ctest_build_all \ && ctest $(CTEST_FLAGS_COMMON) --exclude-regex ctest_build_all --label-exclude skip_memcheck --test-action memcheck \ && ctest $(CTEST_FLAGS_COMMON) --exclude-regex ctest_build_all --label-regex skip_memcheck \ - && chmod +x ../Test/scripts/verify_memcheck_logs.sh \ && ../Test/scripts/verify_memcheck_logs.sh Testing/Temporary # FMILIB_... diff --git a/src/Import/src/FMI3/fmi3_import.c b/src/Import/src/FMI3/fmi3_import.c index ef5d2366..35d97fe9 100644 --- a/src/Import/src/FMI3/fmi3_import.c +++ b/src/Import/src/FMI3/fmi3_import.c @@ -110,7 +110,8 @@ fmi3_import_t* fmi3_import_parse_xml( if (jm_get_dir_abspath(context->callbacks, dirPath, absPath, FILENAME_MAX + 2)) { size_t len = strlen(absPath); - strcpy(absPath + len, FMI_FILE_SEP "resources"); + // Compared to FMI2, in FMI3 we need to add a trailing file separator below + strcpy(absPath + len, FMI_FILE_SEP "resources" FMI_FILE_SEP); fmu->resourcePath = fmi_import_create_URL_from_abs_path(context->callbacks, absPath); } fmu->dirPath = context->callbacks->malloc(strlen(dirPath) + 1);