anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cmake tests: make parallel export tests safer.

Browse Source 
Use different temporary directory for each test.
This commit is contained in:
Kornel Benko 2015-03-28 21:21:16 +01:00
parent fd7e4f2dbb
commit cc3dd7753e
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
development/autotests/export.cmake
View File

@ -28,12 +28,14 @@
# #
set(Perl_Script "${TOP_SRC_DIR}/development/autotests/useSystemFonts.pl") set(Perl_Script "${TOP_SRC_DIR}/development/autotests/useSystemFonts.pl")
set(GetTempDir "${TOP_SRC_DIR}/development/autotests/getTempDir.pl")
set(_ft ${fonttype}) set(_ft ${fonttype})
execute_process(COMMAND ${PERL_EXECUTABLE} "${GetTempDir}" "${WORKDIR}" OUTPUT_VARIABLE TempDir)
message(STATUS "using fonttype = ${_ft}") message(STATUS "using fonttype = ${_ft}")
if(format MATCHES "dvi3|pdf4|pdf5") if(format MATCHES "dvi3|pdf4|pdf5")
message(STATUS "LYX_TESTS_USERDIR = ${LYX_TESTS_USERDIR}") message(STATUS "LYX_TESTS_USERDIR = ${LYX_TESTS_USERDIR}")
message(STATUS "Converting with perl ${Perl_Script}") message(STATUS "Converting with perl ${Perl_Script}")
set(LYX_SOURCE "${WORKDIR}/${file}_${format}_${_ft}.lyx") set(LYX_SOURCE "${TempDir}/${file}_${format}_${_ft}.lyx")
message(STATUS "Using source \"${LYX_ROOT}/${file}.lyx\"") message(STATUS "Using source \"${LYX_ROOT}/${file}.lyx\"")
message(STATUS "Using dest \"${LYX_SOURCE}\"") message(STATUS "Using dest \"${LYX_SOURCE}\"")
execute_process(COMMAND ${PERL_EXECUTABLE} "${Perl_Script}" "${LYX_ROOT}/${file}.lyx" "${LYX_SOURCE}" ${format} ${_ft} execute_process(COMMAND ${PERL_EXECUTABLE} "${Perl_Script}" "${LYX_ROOT}/${file}.lyx" "${LYX_SOURCE}" ${format} ${_ft}
@ -70,6 +72,7 @@ if(reverted)
else() else()
string(COMPARE NOTEQUAL ${_err} 0 _erg) string(COMPARE NOTEQUAL ${_err} 0 _erg)
endif() endif()
execute_process(COMMAND ${CMAKE_COMMAND} -E remove_directory "${TempDir}")
if(_erg) if(_erg)
message(STATUS "Exporting ${f}.lyx to ${format}") message(STATUS "Exporting ${f}.lyx to ${format}")
message(FATAL_ERROR "Export failed") message(FATAL_ERROR "Export failed")

13
development/autotests/getTempDir.pl Executable file
View File

@ -0,0 +1,13 @@
#! /usr/bin/env perl
# -*- mode: perl; -*-
# How to use:
use File::Temp tempdir;
my $template = "$ARGV[0]/AbC_XXXXXX";
my $res = tempdir($template, CLEANUP => 0);
print "$res";
exit(0);