]> git.lyx.org Git - features.git/commitdiff
Cmake tests: make parallel export tests safer.
authorKornel Benko <kornel@lyx.org>
Sat, 28 Mar 2015 20:21:16 +0000 (21:21 +0100)
committerKornel Benko <kornel@lyx.org>
Sat, 28 Mar 2015 20:21:16 +0000 (21:21 +0100)
Use different temporary directory for each test.

development/autotests/export.cmake
development/autotests/getTempDir.pl [new file with mode: 0755]

index 40cf47f94f04227ac0e219b0235cc6dcf9ee8268..e42317937ac61bf9c9c8bfaa7fdfa963afe8f757 100755 (executable)
 #
 
 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 (executable)
index 0000000..5fe8879
--- /dev/null
@@ -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);