50 lines
2.3 KiB
Diff
50 lines
2.3 KiB
Diff
From 91de99623d0e945610be46d46e84b54985415aeb Mon Sep 17 00:00:00 2001
|
|
From: Mattias Ellert <mattias.ellert@physics.uu.se>
|
|
Date: Fri, 28 Oct 2022 06:27:10 +0200
|
|
Subject: [PATCH] Avoid race condition between
|
|
tutorial/roofit/rf512_wsfactory_oper.C and
|
|
tutorial/roofit/rf512_wsfactory_oper.py
|
|
|
|
When run in parallel they delete eachother's files:
|
|
|
|
cc1plus: fatal error: /builddir/build/BUILD/root-6.26.08/redhat-linux-build/runtutorials/RooCFAuto000Pdf_cxx_ACLiC_dict.cxx: No such file or directory
|
|
compilation terminated.
|
|
/usr/bin/ld: cannot find /builddir/build/BUILD/root-6.26.08/redhat-linux-build/runtutorials/RooCFAuto000Pdf_cxx_ACLiC_dict.o: No such file or directory
|
|
collect2: error: ld returned 1 exit status
|
|
---
|
|
tutorials/CMakeLists.txt | 5 +++--
|
|
1 file changed, 3 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/tutorials/CMakeLists.txt b/tutorials/CMakeLists.txt
|
|
index cfba4d3ed9..6ae9be5869 100644
|
|
--- a/tutorials/CMakeLists.txt
|
|
+++ b/tutorials/CMakeLists.txt
|
|
@@ -483,7 +483,7 @@ set(hist-hbars-depends tutorial-tree-cernbuild)
|
|
set(benchmarks-depends tutorial-hsimple
|
|
tutorial-fit-fit1
|
|
tutorial-fit-myfit
|
|
- tutorial-hist-h1ReadAndDraw
|
|
+ tutorial-hist-h1ReadAndDraw
|
|
tutorial-hist-FirstContour
|
|
tutorial-geom-na49view
|
|
tutorial-tree-ntuple1
|
|
@@ -731,7 +731,7 @@ if(ROOT_pyroot_FOUND)
|
|
set(pyroot-benchmarks-depends tutorial-pyroot-hsimple-py
|
|
tutorial-pyroot-fit1-py
|
|
tutorial-pyroot-na49view-py
|
|
- tutorial-pyroot-h1ReadAndDraw-py
|
|
+ tutorial-pyroot-h1ReadAndDraw-py
|
|
tutorial-pyroot-ntuple1-py)
|
|
set(pyroot-fit1-depends tutorial-pyroot-fillrandom-py)
|
|
set(pyroot-na49view-depends tutorial-pyroot-geometry-py)
|
|
@@ -739,6 +739,7 @@ if(ROOT_pyroot_FOUND)
|
|
|
|
# Avoid a race condition: make sure Python tutorial is ran after C++ tutorial
|
|
set(roofit-rf104_classfactory-depends tutorial-roofit-rf104_classfactory)
|
|
+ set(roofit-rf512_wsfactory_oper-depends tutorial-roofit-rf512_wsfactory_oper)
|
|
|
|
#----------------------------------------------------------------------
|
|
# List requirements for python tutorials.
|
|
--
|
|
2.37.3
|
|
|