commit cc3dd7753ee300df3c20525a44ac754fde55c060
Author: Kornel Benko <[email protected]>
Date: Sat Mar 28 21:21:16 2015 +0100
Cmake tests: make parallel export tests safer.
Use different temporary directory for each test.
diff --git a/development/autotests/export.cmake
b/development/autotests/export.cmake
index 40cf47f..e423179 100755
--- a/development/autotests/export.cmake
+++ b/development/autotests/export.cmake
@@ -28,12 +28,14 @@
#
set(Perl_Script "${TOP_SRC_DIR}/development/autotests/useSystemFonts.pl")
+set(GetTempDir "${TOP_SRC_DIR}/development/autotests/getTempDir.pl")
set(_ft ${fonttype})
+execute_process(COMMAND ${PERL_EXECUTABLE} "${GetTempDir}" "${WORKDIR}"
OUTPUT_VARIABLE TempDir)
message(STATUS "using fonttype = ${_ft}")
if(format MATCHES "dvi3|pdf4|pdf5")
message(STATUS "LYX_TESTS_USERDIR = ${LYX_TESTS_USERDIR}")
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 dest \"${LYX_SOURCE}\"")
execute_process(COMMAND ${PERL_EXECUTABLE} "${Perl_Script}"
"${LYX_ROOT}/${file}.lyx" "${LYX_SOURCE}" ${format} ${_ft}
@@ -70,6 +72,7 @@ if(reverted)
else()
string(COMPARE NOTEQUAL ${_err} 0 _erg)
endif()
+execute_process(COMMAND ${CMAKE_COMMAND} -E remove_directory "${TempDir}")
if(_erg)
message(STATUS "Exporting ${f}.lyx to ${format}")
message(FATAL_ERROR "Export failed")
diff --git a/development/autotests/getTempDir.pl
b/development/autotests/getTempDir.pl
new file mode 100755
index 0000000..5fe8879
--- /dev/null
+++ b/development/autotests/getTempDir.pl
@@ -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);