[Rivet-svn] rivet: 2 new changesets

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/7d4dee8b7a2a
branches:  
changeset: 6058:7d4dee8b7a2a
user:      David Grellscheid <david.grellscheid at durham.ac.uk>
date:      Mon Oct 02 11:43:09 2017 +0100
description:
make check fixes

details:   https://rivet.hepforge.org/hg/rivet/rev/2343245ce0e5
branches:  
changeset: 6059:2343245ce0e5
user:      David Grellscheid <david.grellscheid at durham.ac.uk>
date:      Mon Oct 02 12:02:19 2017 +0100
description:
Fix for max arguments exceeded

diffs (truncated from 61 to 50 lines):

--- a/analyses/Makefile.am	Mon Oct 02 11:40:48 2017 +0200
+++ b/analyses/Makefile.am	Mon Oct 02 12:02:19 2017 +0100
@@ -5,7 +5,7 @@
 PLUGIN_DIRS = $(shell ls -d $(srcdir)/plugin*)
 PLUGIN_NAMES = $(notdir $(subst plugin,,$(PLUGIN_DIRS)))
 PLUGIN_LIBS = $(patsubst %,Rivet%Analyses.so,$(PLUGIN_NAMES))
-PLUGIN_DATAFILES = $(shell ls $(srcdir)/plugin*/*.{info,plot,yoda})
+PLUGIN_DATAFILES = $(shell ls $(abs_srcdir)/plugin*/*.{info,plot,yoda})
 
 CLEANFILES = $(PLUGIN_LIBS)
 EXTRA_DIST = $(PLUGIN_DIRS)
@@ -31,7 +31,7 @@
 
 all-local: $(PLUGIN_LIBS) $(PLUGIN_DATAFILES)
 	mkdir -p $(builddir)/data
-	@for i in $(PLUGIN_DATAFILES); do $(LN_S) -f $$i $(builddir)/data; done
+	$(LN_S) -f $(abs_srcdir)/plugin*/*.{info,plot,yoda} $(builddir)/data
 
 clean-local:
 	rm -rf data
--- a/test/Makefile.am	Mon Oct 02 11:40:48 2017 +0200
+++ b/test/Makefile.am	Mon Oct 02 12:02:19 2017 +0100
@@ -20,9 +20,9 @@
 
 TESTS_ENVIRONMENT = \
   RIVET_ANALYSIS_PATH=$(top_builddir)/analyses \
-  RIVET_DATA_PATH=$(top_srcdir)/analyses/data \
-  RIVET_INFO_PATH=$(top_srcdir)/analyses/data \
-  RIVET_REF_PATH=$(top_srcdir)/analyses/data \
+  RIVET_DATA_PATH=$(top_builddir)/analyses/data \
+  RIVET_INFO_PATH=$(top_builddir)/analyses/data \
+  RIVET_REF_PATH=$(top_builddir)/analyses/data \
   LIBLOCATION=$(top_builddir)/src/.libs:$(HEPMCLIBPATH):$(YODALIBPATH):$(FASTJETLIBPATH) \
   LD_LIBRARY_PATH=$$LIBLOCATION:$(LD_LIBRARY_PATH) \
   DYLD_LIBRARY_PATH=$$LIBLOCATION:$(DYLD_LIBRARY_PATH) \
--- a/test/testCmdLine.sh	Mon Oct 02 11:40:48 2017 +0200
+++ b/test/testCmdLine.sh	Mon Oct 02 12:02:19 2017 +0100
@@ -2,8 +2,8 @@
 
 #set -x
 
-export LD_LIBRARY_PATH=$LIBLOCATION
-export DYLD_LIBRARY_PATH=$LIBLOCATION
+export LD_LIBRARY_PATH=$LIBLOCATION:$LD_LIBRARY_PATH
+export DYLD_LIBRARY_PATH=$LIBLOCATION:$DYLD_LIBRARY_PATH
 
 echo PYTHONPATH=$PYTHONPATH
 echo LD_LIBRARY_PATH=$LD_LIBRARY_PATH
--- a/test/testImport.sh	Mon Oct 02 11:40:48 2017 +0200
+++ b/test/testImport.sh	Mon Oct 02 12:02:19 2017 +0100