From b62c6e896127f0c90d4558a90346943eeaf30d1a Mon Sep 17 00:00:00 2001 From: Kornel Benko Date: Sat, 1 Aug 2020 09:35:20 +0200 Subject: [PATCH 1/1] Cmake export tests: Make the destination directory for test results unique Exporting files with identical names (but in different directories) could lead to conflicts in parallel executed tests. --- development/autotests/export.cmake | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/development/autotests/export.cmake b/development/autotests/export.cmake index a9f2a01540..45a2635152 100755 --- a/development/autotests/export.cmake +++ b/development/autotests/export.cmake @@ -48,6 +48,15 @@ if(ENCODING STREQUAL "default") else() set(_enc "_${ENCODING}") endif() + +# move the the last directory part of LYX_ROOT to filename +# to make the destination unique for otherwise identical +# filenames +get_filename_component(updir_ "${LYX_ROOT}" DIRECTORY) +get_filename_component(updir2_ "${LYX_ROOT}" NAME) +set(file "${updir2_}/${file}") +set(LYX_ROOT "${updir_}") + if(format MATCHES "dvi|pdf") message(STATUS "LYX_TESTS_USERDIR = ${LYX_TESTS_USERDIR}") message(STATUS "Converting with perl ${Perl_Script}") -- 2.39.2