From 2b9db22fd9acfc365298d49e6a0b89cc114811da Mon Sep 17 00:00:00 2001
From: Dmitri Konstantinov <dmitri.konstantinov@cern.ch>
Date: Fri, 2 Feb 2024 12:01:53 +0100
Subject: [PATCH] Drop unused testing part of generator's CMakeLists.txt

---
 generators/CMakeLists.txt | 1189 -------------------------------------
 1 file changed, 1189 deletions(-)

diff --git a/generators/CMakeLists.txt b/generators/CMakeLists.txt
index f2151c4616..e00ed1d45f 100644
--- a/generators/CMakeLists.txt
+++ b/generators/CMakeLists.txt
@@ -262,62 +262,6 @@ LCGPackage_Add(
   REVISION 3
 )
 
-foreach(v ${rivet_native_version})
-if (${v} MATCHES "^2.[.]*")
-
-LCG_add_test(
-       rivet-${v}.genser-atlas
-       TEST_COMMAND  ${rivet-${v}_home}/bin/rivet --ignore-beams -a ATLAS_2012_I1083318 ${CMAKE_SOURCE_DIR}/generators/rivet/tests/data.hepmc
-       ENVIRONMENT ${library_path}=${Python_home}/lib:${GSL_home}/lib:${rivet-${v}_home}/lib:${yoda-${rivet_${v}_yoda}_home}/lib:${HepMC_home}/lib:${fastjet_home}/lib:${yamlcpp_home}/lib:$ENV{${library_path}}
-                   PATH=${Python_home}/bin:$ENV{PATH}
-)
-
-LCG_add_test(
-       rivet-${v}.genser-atlas_script
-       TEST_COMMAND $ENV{SHELL} -c "source ${rivet-${v}_home}/rivetenv.${shell_ext}
-                    rivet --ignore-beams -a ATLAS_2012_I1083318 ${CMAKE_SOURCE_DIR}/generators/rivet/tests/data.hepmc"
-       ENVIRONMENT PATH=${Python_home}/bin:$ENV{PATH}
-                   ${library_path}=${Python_home}/lib:${GSL_home}/lib:$ENV{${library_path}}
-)
-else()
-LCG_add_test(rivet-${v}.native-MC_DIJET
-  TEST_COMMAND $ENV{SHELL} -c "source ${rivet-${v}_home}/rivetenv.${shell_ext}
-               rivet --analysis=MC_DIJET ${CMAKE_SOURCE_DIR}/generators/rivet/tests/data.hepmc"
-  ENVIRONMENT
-    ${library_path}=${GSL_home}/lib:$ENV{${library_path}}
-    PATH=${Python_home}/bin:$ENV{PATH}
-)
-endif()
-
-if (NOT shell_ext MATCHES "csh")
-LCG_add_test(rivet-${v}.genser-scripts-mkanalysis
-  TEST_COMMAND $ENV{SHELL} -c "source ${rivet-${v}_home}/rivetenv-genser.sh
-      rivet-mkanalysis ATLAS_2010_S8591806"
-)
-LCG_add_test(rivet-${v}.genser-scripts-buildplugin
-  TEST_COMMAND $ENV{SHELL} -c "source ${rivet-${v}_home}/rivetenv-genser.sh
-      rivet-buildplugin RivetATLAS_2010_S8591806.so ATLAS_2010_S8591806.cc -w"
-  DEPENDS rivet-${v}.genser-scripts-mkanalysis
-)
-LCG_add_test(rivet-${v}.genser-scripts-findid
-  TEST_COMMAND $ENV{SHELL} -c "source ${rivet-${v}_home}/rivetenv-genser.sh
-      rivet-findid 1003.0694"
-)
-LCG_add_test(rivet-${v}.genser-scripts-which
-  TEST_COMMAND $ENV{SHELL} -c "source ${rivet-${v}_home}/rivetenv-genser.sh
-      which rivet-which && rivet-which ATLAS_2010_S8591806* || echo rivet-which is not available for this rivet version"
-)
-LCG_add_test(rivet-${v}.genser-scripts-rivet
-  TEST_COMMAND $ENV{SHELL} -c "source ${rivet-${v}_home}/rivetenv-genser.sh
-      rivet -a MC_WJETS -H data-${v}.yoda ${CMAKE_SOURCE_DIR}/generators/rivet/tests/data.hepmc"
-)
-LCG_add_test(rivet-${v}.genser-scripts-rivet-mkhtml
-  TEST_COMMAND $ENV{SHELL} -c "source ${rivet-${v}_home}/rivetenv-genser.sh
-      rivet-mkhtml -o rivet-mkhtml-${v} ${CMAKE_SOURCE_DIR}/generators/reference/pythia6_riv2_zjetsgenser.yoda ${CMAKE_SOURCE_DIR}/generators/reference/pythia8_riv2_zjetsgenser.yoda"
-)
-endif()
-endforeach()
-
 #---heputils-------------------------------------------------------------------------------------------
 LCGPackage_Add(
   heputils
@@ -470,239 +414,6 @@ LCGPackage_Add(
   DEPENDS pythia8
 )
 
-
-foreach(v ${pythia8_native_version})
-
-if(NOT IS_SYMLINK ${CMAKE_INSTALL_PREFIX}/MCGenerators/pythia8/${v}/${LCG_system})
-
-LCG_add_test(pythia8-${v}.build.native
-  BINARY_DIR pythia8/tests/${v}
-  SOURCE_DIR pythia8/tests
-  BUILD all
-  BUILD_OPTIONS
-   -DCMAKE_MODULE_PATH=${CMAKE_SOURCE_DIR}/cmake/modules
-   -DCMAKE_MODULE_PATH2=${CMAKETOOLS_MODULES}
-   -DPYTHIA8_ROOT_DIR=${pythia8-${v}_home} -DHEPMC_ROOT_DIR=${HepMC_home}
-   -DFASTJET_ROOT_DIR=${fastjet_home}
-   -DNATIVE_TESTS=TRUE
-)
-
-LCG_add_test(pythia8-${v}.native-main01
-  TEST_COMMAND pythia8/tests/${v}/native-main01
-  ENVIRONMENT
-    ${library_path}=${pythia8-${v}_home}/lib:$ENV{${library_path}}
-    IF v MATCHES "HEAD81" OR v MATCHES "^1[0-9][0-9]" THEN
-      PYTHIA8DATA=${pythia8-${v}_home}/xmldoc
-    ELSE
-      PYTHIA8DATA=${pythia8-${v}_home}/share/Pythia8/xmldoc
-    ENDIF
-  DEPENDS pythia8-${v}.build.native)
-
-endif(NOT IS_SYMLINK ${CMAKE_INSTALL_PREFIX}/MCGenerators/pythia8/${v}/${LCG_system})
-
-LCG_add_test(pythia8-${v}.configure-log
-  TEST_COMMAND $ENV{SHELL} -c "cat ${pythia8-${v}_home}/logs/pythia8-${v}-configure.log"
-)
-
-LCG_add_test(pythia8-${v}.build-log
-  TEST_COMMAND $ENV{SHELL} -c "cat ${pythia8-${v}_home}/logs/pythia8-${v}-build.log"
-)
-
-#LCG_add_test(pythia8-${v}.build.genser
-#  BINARY_DIR pythia8/tests/${v}
-#  SOURCE_DIR pythia8/tests
-#  BUILD all
-#  BUILD_OPTIONS
-#   -DCMAKE_MODULE_PATH=${CMAKE_SOURCE_DIR}/cmake/modules
-#   -DCMAKE_MODULE_PATH2=${CMAKETOOLS_MODULES}
-#   -DPYTHIA8_ROOT_DIR=${pythia8-${v}_home} -DHEPMC_ROOT_DIR=${HepMC_home}
-#   -DFASTJET_ROOT_DIR=${fastjet_home}
-#   -DGENSER_TESTS=TRUE
-#)
-
-#LCG_add_test(pythia8-${v}.genser-main14_genser
-#  TEST_COMMAND pythia8/tests/${v}/pythia8_main14_genser ${CMAKE_SOURCE_DIR}/generators/pythia8/tests/ref-pythia8-186-main14-xsec-x86_64-slc6-gcc48-opt.dat
-#  ENVIRONMENT
-#    ${library_path}=${pythia8-${v}_home}/lib:${HepMC_home}/lib:$ENV{${library_path}}
-#    IF v MATCHES "HEAD81" OR v MATCHES "^1[0-9][0-9]" THEN
-#      PYTHIA8DATA=${pythia8-${v}_home}/xmldoc
-#    ELSE
-#      PYTHIA8DATA=${pythia8-${v}_home}/share/Pythia8/xmldoc
-#    ENDIF
-#  DEPENDS pythia8-${v}.build.native)
-
-#LCG_add_test(pythia8-${v}.genser-test1
-#  TEST_COMMAND ${CMAKE_COMMAND} -E chdir pythia8/tests/${v} ./pythia8_genser_test1
-#  POST_COMMAND ${CMAKE_COMMAND} -E copy pythia8/tests/${v}/testi_pythia8.dat pythia8/tests/${v}/test_pythia8.dat
-#  ENVIRONMENT
-#    ${library_path}=${pythia8-${v}_home}/lib:${HepMC_home}/lib:${fastjet_home}/lib:$ENV{${library_path}}
-#    IF v MATCHES "HEAD81" OR v MATCHES "^1[0-9][0-9]" THEN
-#      PYTHIA8DATA=${pythia8-${v}_home}/xmldoc
-#    ELSE
-#      PYTHIA8DATA=${pythia8-${v}_home}/share/Pythia8/xmldoc
-#    ENDIF
-#  DEPENDS pythia8-${v}.build.native)
-
-#LCG_add_test(pythia8-${v}.genser-test2
-#  PRE_COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/generators/pythia8/tests/pythia8_test2.cmnd pythia8/tests/${v}/.
-#  TEST_COMMAND ${CMAKE_COMMAND} -E chdir pythia8/tests/${v} ./pythia8_genser_test2
-#  POST_COMMAND $ENV{SHELL} -c "cat pythia8/tests/${v}/testi_pythia8.dat >> pythia8/tests/${v}/test_pythia8.dat"
-#  ENVIRONMENT
-#    ${library_path}=${pythia8-${v}_home}/lib:${HepMC_home}/lib:${fastjet_home}/lib:$ENV{${library_path}}
-#    IF v MATCHES "HEAD81" OR v MATCHES "^1[0-9][0-9]" THEN
-#      PYTHIA8DATA=${pythia8-${v}_home}/xmldoc
-#    ELSE
-#      PYTHIA8DATA=${pythia8-${v}_home}/share/Pythia8/xmldoc
-#    ENDIF
-#  DEPENDS pythia8-${v}.build.native pythia8-${v}.genser-test1)
-
-#LCG_add_test(pythia8-${v}.genser-test3
-#  TEST_COMMAND ${CMAKE_COMMAND} -E chdir pythia8/tests/${v} ./pythia8_genser_test3
-#  POST_COMMAND $ENV{SHELL} -c "cat pythia8/tests/${v}/testi_pythia8.dat >> pythia8/tests/${v}/test_pythia8.dat"
-#  ENVIRONMENT
-#    ${library_path}=${pythia8-${v}_home}/lib:${HepMC_home}/lib:$ENV{${library_path}}
-#    IF v MATCHES "HEAD81" OR v MATCHES "^1[0-9][0-9]" THEN
-#      PYTHIA8DATA=${pythia8-${v}_home}/xmldoc
-#    ELSE
-#      PYTHIA8DATA=${pythia8-${v}_home}/share/Pythia8/xmldoc
-#    ENDIF
-#  DEPENDS pythia8-${v}.build.native pythia8-${v}.genser-test1)
-
-#LCG_add_test(pythia8-${v}.genser-test4
-#  TEST_COMMAND ${CMAKE_COMMAND} -E chdir pythia8/tests/${v} ./pythia8_genser_test4
-#  POST_COMMAND $ENV{SHELL} -c "cat pythia8/tests/${v}/testi_pythia8.dat >> pythia8/tests/${v}/test_pythia8.dat"
-#  ENVIRONMENT
-#    ${library_path}=${pythia8-${v}_home}/lib:${HepMC_home}/lib:$ENV{${library_path}}
-#    IF v MATCHES "HEAD81" OR v MATCHES "^1[0-9][0-9]" THEN
-#      PYTHIA8DATA=${pythia8-${v}_home}/xmldoc
-#    ELSE
-#      PYTHIA8DATA=${pythia8-${v}_home}/share/Pythia8/xmldoc
-#    ENDIF
-#  DEPENDS pythia8-${v}.build.native pythia8-${v}.genser-test1)
-
-#LCG_add_test(pythia8-${v}.compare
-#  PRE_COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/generators/pythia8/tests/compare/chi.c pythia8/tests/${v}/.
-#  TEST_COMMAND ${CMAKE_COMMAND} -E chdir pythia8/tests/${v} ${CMAKE_SOURCE_DIR}/generators/pythia8/tests/compare/cmpr.sh pythia8 ${CMAKE_SOURCE_DIR}/generators/pythia8/tests/compare/reference.dat ${v} ${LCG_VERSION} ${LCG_platform} ${CMAKE_SOURCE_DIR}/generators/pythia8/tests
-#  DEPENDS pythia8-${v}.genser-test2 pythia8-${v}.genser-test3 pythia8-${v}.genser-test4)
-
-#if(${v} MATCHES "^2[0-9][0-9]" OR ${v} MATCHES "HEAD$")
-#  LCG_add_test(pythia8-${v}.genser-test1-lhapdf
-#    TEST_COMMAND ${CMAKE_COMMAND} -E chdir pythia8/tests/${v} ./pythia8_genser_test1_lhapdf
-#    POST_COMMAND ${CMAKE_COMMAND} -E copy pythia8/tests/${v}/testi_pythia8.dat pythia8/tests/${v}/test_pythia8_lhapdf.dat
-#    ENVIRONMENT
-#      ${library_path}=${pythia8-${v}_home}/lib:${HepMC_home}/lib:${lhapdf_home}/lib:${Boost_home}/lib:${yamlcpp_home}/lib:$ENV{${library_path}}
-#      LHAPDF_DATA_PATH=${lhapdf_home}/share/LHAPDF:${CMAKE_INSTALL_PREFIX}/lhapdf6sets/current/share/LHAPDF
-#      PYTHIA8DATA=${pythia8-${v}_home}/share/Pythia8/xmldoc
-#
-#    DEPENDS pythia8-${v}.build.native lhapdf6sets.download
-#  )
-
-#  LCG_add_test(pythia8-${v}.compare-lhapdf
-#    TEST_COMMAND ${CMAKE_COMMAND} -E chdir pythia8/tests/${v} ${CMAKE_SOURCE_DIR}/generators/pythia8/tests/compare/cmpr.sh pythia8_lhapdf ${CMAKE_SOURCE_DIR}/generators/pythia8/tests/compare/reference_lhapdf.dat ${v} ${LCG_VERSION} ${LCG_platform} ${CMAKE_SOURCE_DIR}/generators/pythia8/tests
-#    DEPENDS pythia8-${v}.genser-test1-lhapdf pythia8-${v}.compare
-#  )
-
-#endif()
-
-endforeach()
-
-
-#---lhapdf5 tests
-foreach(v ${lhapdf_native_version})
-  if(v VERSION_LESS 6.0.0)
-    LCG_add_test(lhapdf-${v}.build
-      BINARY_DIR lhapdf/tests/${v}
-      SOURCE_DIR lhapdf/tests
-      BUILD all
-      BUILD_OPTIONS
-       -DCMAKE_MODULE_PATH=${CMAKETOOLS_MODULES}
-       -DLHAPDF_ROOT_DIR=${lhapdf-${v}_home}
-    )
-
-    foreach(i native-CCTest1 native-CCTest3 native-CCTest4)
-      LCG_add_test(lhapdf-${v}.${i}
-        TEST_COMMAND lhapdf/tests/${v}/${i}
-        ENVIRONMENT
-          ${library_path}=${lhapdf-${v}_home}/lib:$ENV{${library_path}}
-          LHAPATH=${lhapdfsets_home}/../share/lhapdf/PDFsets
-        DEPENDS lhapdf-${v}.build
-      )
-    endforeach()
-  endif()
-endforeach()
-
-#---lhapdf6 tests
-foreach(v ${lhapdf_native_version})
-  if(v VERSION_GREATER 5.9.9)
-    LCG_add_test(lhapdf-${v}.native-testpdf
-      TEST_COMMAND lhapdf6/tests/${v}/native-testpdf CT10 1
-      BINARY_DIR lhapdf6/tests/${v}
-      SOURCE_DIR lhapdf6/tests
-      BUILD native-testpdf
-      BUILD_OPTIONS
-       -DCMAKE_MODULE_PATH=${CMAKETOOLS_MODULES}
-       -DLHAPDF6_ROOT_DIR=${lhapdf-${v}_home}
-       -DBOOST_ROOT=${Boost_home}
-       -DBoost_INCLUDE_DIR=${Boost_home_include}
-       -DYAMLCPP_ROOT_DIR=${yamlcpp_home}
-      ENVIRONMENT
-        ${library_path}=${lhapdf-${v}_home}/lib:${Boost_home}/lib:${yamlcpp_home}/lib:$ENV{${library_path}}
-        LHAPDF_DATA_PATH=${lhapdf-${v}_home}/share/LHAPDF:${CMAKE_INSTALL_PREFIX}/lhapdf6sets/current/share/LHAPDF
-      DEPENDS lhapdf6sets.download
-    )
-
-    LCG_add_test(lhapdf-${v}.genser-pythia8
-      TEST_COMMAND lhapdf6/tests/pyt8/${v}/lhapdf6_pyt8
-      BINARY_DIR lhapdf6/tests/pyt8/${v}
-      SOURCE_DIR lhapdf6/tests/pyt8
-      BUILD lhapdf6_pyt8
-      BUILD_OPTIONS
-       -DCMAKE_MODULE_PATH=${CMAKE_SOURCE_DIR}/cmake/modules
-       -DCMAKE_MODULE_PATH2=${CMAKETOOLS_MODULES}
-       -DLHAPDF6_ROOT_DIR=${lhapdf-${v}_home}
-       -DBOOST_ROOT=${Boost_home}
-       -DBoost_INCLUDE_DIR=${Boost_home_include}
-       -DYAMLCPP_ROOT_DIR=${yamlcpp_home}
-       -DPYTHIA8_ROOT_DIR=${pythia8_home}
-      ENVIRONMENT
-        ${library_path}=${lhapdf-${v}_home}/lib:${pythia8_home}/lib:${Boost_home}/lib:${yamlcpp_home}/lib:$ENV{${library_path}}
-        LHAPDF_DATA_PATH=${lhapdf-${v}_home}/share/LHAPDF:${CMAKE_INSTALL_PREFIX}/lhapdf6sets/current/share/LHAPDF
-        IF pythia8_work_version MATCHES "HEAD81" OR pythia8_work_version MATCHES "^1[0-9][0-9]" THEN
-          PYTHIA8DATA=${pythia8_home}/xmldoc
-        ELSE
-          PYTHIA8DATA=${pythia8_home}/share/Pythia8/xmldoc
-        ENDIF
-      POST_COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/generators/pythia8/tests/compare/chi.c .
-           COMMAND ${CMAKE_COMMAND} -E copy testi_lhapdf6.dat test_lhapdf6.dat
-           COMMAND ${CMAKE_SOURCE_DIR}/generators/pythia8/tests/compare/cmpr.sh lhapdf6 ${CMAKE_SOURCE_DIR}/generators/lhapdf6/tests/pyt8/reference.dat ${v} ${LCG_VERSION} ${LCG_platform} ${CMAKE_SOURCE_DIR}/generators/lhapdf6/tests/pyt8
-      DEPENDS lhapdf6sets.download
-    )
-  endif()
-endforeach()
-
-
-# HepMC 3 test - hepmc3
-foreach(hmc3variant hepmc3 hepmc3-cxx11)
-foreach(v ${${hmc3variant}_native_version})
-  LCG_add_test(${hmc3variant}-${v}.native-basic_tree
-    TEST_COMMAND $ENV{SHELL} -c "source ${${hmc3variant}_home}/hepmc3-env.sh; ${${hmc3variant}_home}/bin/basic_tree.exe"
-  )
-
-  LCG_add_test(${hmc3variant}-${v}.native-hepevt_wrapper_example
-    TEST_COMMAND $ENV{SHELL} -c "source ${${hmc3variant}_home}/hepmc3-env.sh; ${${hmc3variant}_home}/bin/hepevt_wrapper_example.exe"
-  )
-
- LCG_add_test(${hmc3variant}-${v}.native-pythia8_example
-  PRE_COMMAND  ${CMAKE_COMMAND} -E copy ${${hmc3variant}_home}/../share/sources/examples/Pythia8Example/pythia8_ee_to_Z_to_tautau.conf .
-  TEST_COMMAND $ENV{SHELL} -c "source ${${hmc3variant}_home}/hepmc3-env.sh; ${${hmc3variant}_home}/bin/pythia8_example.exe pythia8_ee_to_Z_to_tautau.conf hepmc3-output.${v}.output"
-  ENVIRONMENT
-    PYTHIA8DATA=${pythia8_home}/xmldoc
- )
-
-endforeach()
-endforeach()
-
-
 #---vincia------------------------------------------------------------------------------------------
 LCGPackage_Add(
   vincia
@@ -772,26 +483,6 @@ LCGPackage_Add(
   IF NOT <VERSION> VERSION_LESS 2.1.1 THEN automake Boost ENDIF
 )
 
-if (NOT shell_ext MATCHES "csh")
-foreach(v ${thepeg_native_version})
-  LCG_add_test(thepeg-${v}.genser-scripts-setupThePEG
-    PRE_COMMAND ${CMAKE_COMMAND} -E make_directory thepeg/${v}
-    TEST_COMMAND ${CMAKE_COMMAND} -E chdir thepeg/${v} $ENV{SHELL} -c "source ${thepeg-${v}_home}/thepegenv-genser.sh
-      setupThePEG ${thepeg-${v}_home}/share/ThePEG/MultiLEP.in"
-    ENVIRONMENT LHAPDF_DATA_PATH=${lhapdf-${thepeg_${v}_lhapdf}_home}/share/LHAPDF:${CMAKE_INSTALL_PREFIX}/lhapdf6sets/current/share/LHAPDF
-    DEPENDS lhapdf6sets.download
-  )
-  LCG_add_test(thepeg-${v}.genser-scripts-runThePEG
-    TEST_COMMAND ${CMAKE_COMMAND} -E chdir thepeg/${v} $ENV{SHELL} -c "source ${thepeg-${v}_home}/thepegenv-genser.sh
-      runThePEG MultiLEP.run"
-    POST_COMMAND ${CMAKE_COMMAND} -E chdir thepeg/${v} cat MultiLEP.out
-    DEPENDS thepeg-${v}.genser-scripts-setupThePEG
-  )
-endforeach()
-endif()
-
-#${CMAKE_SOURCE_DIR}/generators/thepeg/tests/MultiLEP.in
-
 #---Herwig++------------------------------------------------------------------------------------------
 #Version 2.6.2 compiles on Mac, however the installation does not run :-(
 LCGPackage_Add(
@@ -819,53 +510,6 @@ LCGPackage_Add(
     DEPENDS GSL Boost thepeg fastjet
 )
 
-foreach(v ${herwig++_native_version})
-LCG_add_test(herwigpp-${v}.native-LHC
-			  TEST_COMMAND ${herwig++-${v}_home}/bin/Herwig++ read ${herwig++-${v}_home}/../share/sources/src/LHC.in
-			       COMMAND ${herwig++-${v}_home}/bin/Herwig++ run -N100 LHC.run -d1
-                          POST_COMMAND cat LHC.out
-			       COMMAND cat LHC.log
-                          BINARY_DIR herwig++/tests
-                          SOURCE_DIR herwig++/tests
-                          ENVIRONMENT ${library_path}=${herwig++-${v}_home}/lib:${thepeg-${herwig++_${v}_thepeg}_home}/lib/ThePEG:${HepMC_home}/lib:${lhapdf-${thepeg_${herwig++_${v}_thepeg}_lhapdf}_home}/lib:${fastjet_home}/lib:${GSL_home}/lib:$ENV{${library_path}})
-
-LCG_add_test(herwigpp-${v}.native-TVT
-			  TEST_COMMAND ${herwig++-${v}_home}/bin/Herwig++ read ${herwig++-${v}_home}/../share/sources/src/TVT.in
-                               COMMAND ${herwig++-${v}_home}/bin/Herwig++ run -N100 TVT.run -d1
-                          POST_COMMAND cat TVT.out
-                               COMMAND cat TVT.log
-                          BINARY_DIR herwig++/tests
-                          SOURCE_DIR herwig++/tests
-                          ENVIRONMENT ${library_path}=${herwig++-${v}_home}/lib:${thepeg-${herwig++_${v}_thepeg}_home}/lib/ThePEG:${HepMC_home}/lib:${lhapdf-${thepeg_${herwig++_${v}_thepeg}_lhapdf}_home}/lib:${fastjet_home}/lib:${GSL_home}/lib:$ENV{${library_path}})
-
-#LCG_add_test(herwigpp-${v}.genser-LHC-W
-#  TEST_COMMAND ${herwig++-${v}_home}/bin/Herwig++ read ${CMAKE_SOURCE_DIR}/generators/herwig++/tests/LHC-W.in --repo=${herwig++-${v}_home}/share/Herwig++/HerwigDefaults.rpo
-#       COMMAND ${herwig++-${v}_home}/bin/Herwig++ run -N50 LHC-W.run -d1
-#  POST_COMMAND cat LHC-W.out
-#       COMMAND cat LHC-W.log
-#  BINARY_DIR herwig++/tests
-#  SOURCE_DIR herwig++/tests
-#  ENVIRONMENT ${library_path}=${herwig++-${v}_home}/lib:${thepeg-${herwig++_${v}_thepeg}_home}/lib/ThePEG:${HepMC_home}/lib:${lhapdf-${thepeg_${herwig++_${v}_thepeg}_lhapdf}_home}/lib:${fastjet_home}/lib:${GSL_home}/lib:$ENV{${library_path}}
-#  LHAPDF_DATA_PATH=${lhapdf-${thepeg_${herwig++_${v}_thepeg}_lhapdf}_home}/share/LHAPDF:${CMAKE_INSTALL_PREFIX}/lhapdf6sets/current/share/LHAPDF
-#  DEPENDS lhapdf6sets.download
-#)
-
-# native herwig++ tests (not all of them are run)
-
-LCG_add_test(herwigpp-${v}.native-LEP-VV
-      TEST_COMMAND ${CMAKE_COMMAND} -E chdir ${PROJECT_BINARY_DIR}/generators/herwig++-${v}/src/herwig++/${v}/Tests make -j1 test-LEP-VV REPO=${herwig++-${v}_home}/share/Herwig++/HerwigDefaults.rpo
-           COMMAND ${CMAKE_COMMAND} -E chdir ${PROJECT_BINARY_DIR}/generators/herwig++-${v}/src/herwig++/${v}/Tests cat LEP-VV.log
-      ENVIRONMENT ${library_path}=${herwig++-${v}_home}/lib:${thepeg-${herwig++_${v}_thepeg}_home}/lib/ThePEG:${HepMC_home}/lib:${lhapdf-${thepeg_${herwig++_${v}_thepeg}_lhapdf}_home}/lib:${fastjet_home}/lib:${GSL_home}/lib:$ENV{${library_path}})
-
-foreach(herwig-leptest LEP-VH LEP-VBF LEP-BB LEP-Quarks LEP-Leptons LEP-default LEP-Powheg)
-LCG_add_test(herwigpp-${v}.native-${herwig-leptest}
-      TEST_COMMAND ${CMAKE_COMMAND} -E chdir ${PROJECT_BINARY_DIR}/generators/herwig++-${v}/src/herwig++/${v}/Tests make -j1 test-${herwig-leptest} REPO=${herwig++-${v}_home}/share/Herwig++/HerwigDefaults.rpo
-           COMMAND ${CMAKE_COMMAND} -E chdir ${PROJECT_BINARY_DIR}/generators/herwig++-${v}/src/herwig++/${v}/Tests cat ${herwig-leptest}.log
-      ENVIRONMENT ${library_path}=${herwig++-${v}_home}/lib:${thepeg-${herwig++_${v}_thepeg}_home}/lib/ThePEG:${HepMC_home}/lib:${lhapdf-${thepeg_${herwig++_${v}_thepeg}_lhapdf}_home}/lib:${fastjet_home}/lib:${GSL_home}/lib:$ENV{${library_path}}
-      DEPENDS herwigpp-${v}.native-LEP-VV)
-endforeach()
-endforeach()
-
 #---tauola++------------------------------------------------------------------------------------------
 if(LCGCMAKE_CXX_STANDARD_FLAG)
   set(TAUOLA_CXX_FLAGS "-I${Boost_home_include} ${LCGCMAKE_CXX_STANDARD_FLAG}")
@@ -913,57 +557,6 @@ LCGPackage_Add(
   REVISION 3
 )
 
-foreach(v ${pythia6_native_version})
-
-if(NOT IS_SYMLINK ${CMAKE_INSTALL_PREFIX}/MCGenerators/pythia6/${v}/${LCG_system})
-
-LCG_add_test(pythia6-${v}.build.native
-  BINARY_DIR pythia6/tests/${v}
-  SOURCE_DIR pythia6/tests
-  BUILD all
-  BUILD_OPTIONS -DCMAKE_MODULE_PATH=${CMAKE_SOURCE_DIR}/cmake/modules
-                -DCMAKE_MODULE_PATH2=${CMAKETOOLS_MODULES}
-                -DPYTHIA6_ROOT_DIR=${pythia6-${v}_home} -DHEPMC_ROOT_DIR=${HepMC_home}
-                -DFASTJET_ROOT_DIR=${fastjet_home} -DNATIVE_TESTS=TRUE
-  ENVIRONMENT ${library_path}=${pythia6-${v}_home}/lib:${HepMC_home}/lib:$ENV{${library_path}})
-
-endif(NOT IS_SYMLINK ${CMAKE_INSTALL_PREFIX}/MCGenerators/pythia6/${v}/${LCG_system})
-
-LCG_add_test(pythia6-${v}.build.genser
-  BINARY_DIR pythia6/tests/${v}
-  SOURCE_DIR pythia6/tests
-  BUILD all
-  BUILD_OPTIONS -DCMAKE_MODULE_PATH=${CMAKE_SOURCE_DIR}/cmake/modules
-                -DCMAKE_MODULE_PATH2=${CMAKETOOLS_MODULES}
-                -DPYTHIA6_ROOT_DIR=${pythia6-${v}_home} -DHEPMC_ROOT_DIR=${HepMC_home}
-                -DFASTJET_ROOT_DIR=${fastjet_home} -DGENSER_TESTS=TRUE
-  ENVIRONMENT ${library_path}=${pythia6-${v}_home}/lib:${HepMC_home}/lib:$ENV{${library_path}})
-
-
-if(NOT IS_SYMLINK ${CMAKE_INSTALL_PREFIX}/MCGenerators/pythia6/${v}/${LCG_system})
-
-LCG_add_test(pythia6-${v}.native-test
-  TEST_COMMAND pythia6/tests/${v}/pythia6_orig_test1
-  ENVIRONMENT ${library_path}=${pythia6-${v}_home}/lib:${HepMC_home}/lib:$ENV{${library_path}}
-  DEPENDS pythia6-${v}.build)
-
-endif(NOT IS_SYMLINK ${CMAKE_INSTALL_PREFIX}/MCGenerators/pythia6/${v}/${LCG_system})
-
-LCG_add_test(pythia6-${v}.genser-test
-  TEST_COMMAND ${CMAKE_COMMAND} -E chdir pythia6/tests/${v} ./pythia6_genser_test1
-  POST_COMMAND ${CMAKE_COMMAND} -E chdir pythia6/tests/${v} ${CMAKE_COMMAND} -E copy testi_pythia6.dat test_pythia6.dat
-  ENVIRONMENT ${library_path}=${pythia6-${v}_home}/lib:${HepMC_home}/lib:$ENV{${library_path}}
-  DEPENDS pythia6-${v}.build
-  )
-
-LCG_add_test(pythia6-${v}.genser-compare
-  PRE_COMMAND ${CMAKE_COMMAND} -E chdir pythia6/tests/${v} ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/generators/pythia8/tests/compare/chi.c .
-  TEST_COMMAND ${CMAKE_COMMAND} -E chdir pythia6/tests/${v} ${CMAKE_SOURCE_DIR}/generators/pythia8/tests/compare/cmpr.sh pythia6 ${CMAKE_SOURCE_DIR}/generators/pythia6/tests/reference.dat ${v} ${LCG_VERSION} ${LCG_platform} ${CMAKE_SOURCE_DIR}/generators/pythia6/tests
-  DEPENDS pythia6-${v}.genser-test
-
-)
-endforeach()
-
 #---agile------------------------------------------------------------------------------------------
 LCGPackage_Add(
   agile
@@ -991,23 +584,6 @@ LCGPackage_Add(
   DEPENDS HepMC Boost Python swig future autoconf automake libtool
 )
 
-foreach(v ${agile_native_version})
-
-if (NOT shell_ext MATCHES "csh")
-LCG_add_test(agile-${v}.genser-scripts-pythia6
-  TEST_COMMAND $ENV{SHELL} -c "source ${agile-${v}_home}/agileenv-genser.sh
-    agile-runmc Pythia6:${pythia6_test_version} -o agile-scripts-hepmc-${v}.dat"
-)
-endif()
-
-LCG_add_test(agile-${v}.native-test_pythia6 TEST_COMMAND ${agile-${v}_home}/bin/agile-runmc Pythia6:${pythia6_test_version} -o hepmcfile.dat
-                              ENVIRONMENT PATH=${agile-${v}_home}/bin:${Python_home}/bin:$ENV{PATH}
-                                          ${library_path}=${agile-${v}_home}/lib:${HepMC_home}/lib:$ENV{${library_path}}
-                                          PYTHONPATH=${agile-${v}_home}/lib/python${Python_config_version_twodigit}/site-packages:$ENV{PYTHONPATH}
-                                          AGILE_GEN_PATH=${agile-${v}_home}/../../..
-                              )
-endforeach()
-
 #---photos------------------------------------------------------------------------------------------
 if(NOT APPLE)    #  (installation fails on MacOSX)
   LCGPackage_Add(
@@ -1023,20 +599,7 @@ if(NOT APPLE)    #  (installation fails on MacOSX)
             COMMAND ${CMAKE_COMMAND} -E chdir <INSTALL_DIR>/lib ${CMAKE_COMMAND} -E create_symlink archive/libphotos.a libphotos.a
   )
 
-foreach(v ${photos_native_version})
-LCG_add_test(photos-${v}.genser-test TEST_COMMAND photos/tests/${v}/photos_test1
-                          BINARY_DIR photos/tests/${v}
-                          SOURCE_DIR photos/tests
-                          BUILD photos_test1
-                          BUILD_OPTIONS -DPHOTOS_ROOT_DIR=${photos-${v}_home}
-                                        -DPYTHIA6_ROOT_DIR=${pythia6_home}
-                                        -DCMAKE_MODULE_PATH=${CMAKETOOLS_MODULES}
-                          FAILREGEX "Fatal error"
-                          ENVIRONMENT ${library_path}=${photos-${v}_home}/lib:${pythia6_home}/lib:$ENV{${library_path}})
-endforeach()
-
 endif()
-
 #---professor------------------------------------------------------------------------------------------
 LCGPackage_Add(
   professor
@@ -1059,44 +622,6 @@ LCGPackage_Add(
   ENDIF
 )
 
-foreach (v ${professor_native_version})
-LCG_add_test(professor-${v}.genser-import
-  IF ${v} VERSION_GREATER 1.9.0 THEN
-  TEST_COMMAND ${Python_cmd} -c "import professor2 as prof;"
-  ENVIRONMENT CYTHON=${cython_home}/bin/cython PYTHONPATH=${cython_pythonpath}:${pyanalysis_home}/lib/python${Python_config_version_twodigit}/site-packages:${professor-${v}_home}/lib/python${Python_config_version_twodigit}/site-packages ${library_path}=${ROOT_home}/lib:${cython_home}/lib:${professor-${v}_home}/lib:${Python_home}/lib:$ENV{${library_path}}
-  ENDIF
-  IF ${v} VERSION_LESS 2.0.0 THEN
-  TEST_COMMAND ${Python_cmd} -c "import professor.user as prof;"
-  ENVIRONMENT PYTHONPATH=${pyanalysis_home}/lib/python${Python_config_version_twodigit}/site-packages:${professor-${v}_home}/lib/python${Python_config_version_twodigit}/site-packages ${library_path}=${ROOT_home}/lib:$ENV{${library_path}}
-  ENDIF
-)
-
-LCG_add_test(professor-${v}.genser-executable
-  IF ${v} VERSION_GREATER 1.9.0 THEN
-  TEST_COMMAND ${professor-${v}_home}/bin/prof2-ipol -h
-  ENVIRONMENT CYTHON=${cython_home}/bin/cython PYTHONPATH=${cython_pythonpath}:${pyanalysis_home}/lib/python${Python_config_version_twodigit}/site-packages:${professor-${v}_home}/lib/python${Python_config_version_twodigit}/site-packages ${library_path}=${ROOT_home}/lib:${cython_home}/lib:${professor-${v}_home}/lib:${Python_home}/lib:$ENV{${library_path}}
-  ENDIF
-  IF ${v} VERSION_LESS 2.0.0 THEN
-  TEST_COMMAND ${professor-${v}_home}/bin/prof-interpolate -h
-  ENVIRONMENT PYTHONPATH=${pyanalysis_home}/lib/python${Python_config_version_twodigit}/site-packages:${professor-${v}_home}/lib/python${Python_config_version_twodigit}/site-packages ${library_path}=${ROOT_home}/lib:${Python_home}/lib:$ENV{${library_path}} PATH=${Python_home}/bin:$ENV{PATH}
-  ENDIF
-)
-
-if (NOT shell_ext MATCHES "csh")
-LCG_add_test(professor-${v}.genser-scripts-executable
-  IF ${v} VERSION_GREATER 1.9.0 THEN
-  TEST_COMMAND $ENV{SHELL} -c "source ${professor-${v}_home}/professorenv-genser.sh
-               prof2-ipol -h"
-  ENDIF
-  IF ${v} VERSION_LESS 2.0.0 THEN
-  TEST_COMMAND $ENV{SHELL} -c "source ${professor-${v}_home}/professorenv-genser.sh
-               prof-interpolate -h"
-  ENDIF
-)
-endif()
-
-endforeach()
-
 #---pyquen--------------------------------------------------------------------------------------
 LCGPackage_Add(
   pyquen
@@ -1107,19 +632,6 @@ LCGPackage_Add(
   CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
 )
 
-foreach(v ${pyquen_native_version})
-LCG_add_test(pyquen-${v}.genser-test1
-  TEST_COMMAND pyquen/tests/${v}/pyquen_test1
-  BINARY_DIR pyquen/tests/${v}
-  SOURCE_DIR pyquen/tests
-  BUILD pyquen_test1
-  BUILD_OPTIONS
-   -DPYQUEN_ROOT_DIR=${pyquen-${v}_home}
-   -DPYTHIA6_ROOT_DIR=${pythia6_home}
-   -DCMAKE_MODULE_PATH=${CMAKETOOLS_MODULES}
-  ENVIRONMENT ${library_path}=${pyquen-${v}_home}/lib:${pythia6_home}/lib:$ENV{${library_path}})
-endforeach()
-
 #---hydjet--------------------------------------------------------------------------------------
 LCGPackage_Add(
   hydjet
@@ -1130,20 +642,6 @@ LCGPackage_Add(
   CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
 )
 
-foreach(v ${hydjet_native_version})
-LCG_add_test(hydjet-${v}.genser-test
-  TEST_COMMAND hydjet/tests/${v}/hydjet_test1
-  BINARY_DIR hydjet/tests/${v}
-  SOURCE_DIR hydjet/tests
-  BUILD all
-  BUILD_OPTIONS
-   -DHYDJET_ROOT_DIR=${hydjet-${v}_home}
-   -DPYTHIA6_ROOT_DIR=${pythia6_home}
-   -DPYQUEN_ROOT_DIR=${pyquen_home}
-   -DCMAKE_MODULE_PATH=${CMAKETOOLS_MODULES}
-  ENVIRONMENT ${library_path}=${hydjet-${v}_home}/lib:${pyquen_home}/lib:${pythia6_home}/lib:$ENV{${library_path}})
-endforeach()
-
 #---photos++------------------------------------------------------------------------------------------
 LCGPackage_Add(
   photos++
@@ -1215,35 +713,6 @@ LCGPackage_Add(
 
 )
 
-
-foreach(v ${evtgen_native_version})
-  LCG_add_test(evtgen-${v}.genser-test TEST_COMMAND evtgen-${v}/tests/evtgen_test1 ${evtgen-${v}_home}/share/DECAY_2010.DEC ${evtgen-${v}_home}/share/evt.pdl ${CMAKE_CURRENT_SOURCE_DIR}/evtgen/tests/DDALITZ.DEC 10000
-    BINARY_DIR evtgen-${v}/tests
-    SOURCE_DIR evtgen/tests
-    BUILD evtgen_test1
-    BUILD_OPTIONS -DCMAKE_MODULE_PATH=${CMAKE_SOURCE_DIR}/cmake/modules
-                  -DMYADDMODULEPATH=${CMAKETOOLS_MODULES}
-                  -DROOTSYS=${ROOT_home}
-                  -DEVTGEN_ROOT_DIR=${evtgen-${v}_home} -DPYTHIA8_ROOT_DIR=${pythia8-${evtgen_${v}_pythia8}_home}
-                  -DPHOTOSPP_ROOT_DIR=${photos++_home} -DTAUOLAPP_ROOT_DIR=${tauola++-${evtgen_${v}_tauola++}_home}
-                  -DHEPMC_ROOT_DIR=${HepMC_home}
-                  IF ${v} VERSION_GREATER 1.3.5 THEN
-                  -DUPDATEDHEADER=ON
-                  ENDIF
-		  IF LCGCMAKE_CXX_STANDARD_FLAG THEN -DCMAKE_CXX_FLAGS=${LCGCMAKE_CXX_STANDARD_FLAG} ENDIF
-    ENVIRONMENT ${library_path}=${evtgen-${v}_home}/lib:${photos++_home}/lib:${pythia8-${evtgen_${v}_pythia8}_home}/lib:${HepMC_home}/lib:${ROOT_home}/lib:$ENV{${library_path}}
-                PYTHIA8DATA=${pythia8-${evtgen_${v}_pythia8}_home}/xmldoc
-  )
-
-  LCG_add_test(evtgen-${v}.compare
-    PRE_COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/generators/pythia8/tests/compare/chi.c evtgen-${v}/tests/.
-        COMMAND ${CMAKE_COMMAND} -E copy evtgen-${v}/tests/testi.dat evtgen-${v}/tests/test_evtgen.dat
-    TEST_COMMAND ${CMAKE_COMMAND} -E chdir evtgen-${v}/tests ${CMAKE_SOURCE_DIR}/generators/pythia8/tests/compare/cmpr.sh evtgen ${CMAKE_SOURCE_DIR}/generators/evtgen/tests/compare/reference.dat ${v} ${LCG_VERSION} ${LCG_platform} ${CMAKE_SOURCE_DIR}/generators/evtgen/tests
-    DEPENDS evtgen-${v}.genser-test
-
-  )
-endforeach()
-
 #---RapidSim------------------------------------------------------------------------------------------
 LCGPackage_Add(
   rapidsim
@@ -1262,31 +731,6 @@ LCGPackage_Add(
   IF <NATIVE_VERSION> VERSION_GREATER 1.4.0 THEN evtgen pythia8 ENDIF
 )
 
-foreach(v ${rapidsim_native_version})
-  LCG_add_test(rapidsim-${v}.validation
-    TEST_COMMAND $ENV{SHELL} -c "source ${rapidsim-${v}_home}/rapidsimenv-genser.sh
-      /bin/bash ${rapidsim-${v}_home}/bin/runValidation.sh"
-    #LABELS Nightly Release
-  )
-endforeach()
-
-set (yoda_convert_scripts "aida" "flat")
-if (EXISTS "${ROOT_home}/")
-  list(APPEND yoda_convert_scripts "root")
-endif()
-
-if (NOT shell_ext MATCHES "csh")
- foreach(v ${yoda_native_version})
-  foreach(f ${yoda_convert_scripts})
-  LCG_add_test(yoda-${v}.genser-scripts-yoda2${f}
-    PRE_COMMAND ${CMAKE_COMMAND} -E make_directory yoda/tests/${v}
-    TEST_COMMAND ${CMAKE_COMMAND} -E chdir yoda/tests/${v} $ENV{SHELL} -c "source ${yoda-${v}_home}/yodaenv-genser.sh
-      yoda2${f} ${CMAKE_SOURCE_DIR}/generators/reference/sherpa_riv2_zjetsgenser.yoda"
-  )
-  endforeach()
- endforeach()
-endif()
-
 #---QD------------------------------------------------------------------------------------------
 LCGPackage_Add(
   qd
@@ -1317,32 +761,6 @@ if("${Python_native_version}" VERSION_LESS 3)
   )
 endif()
 
-if("${Python_native_version}" VERSION_LESS 3)
-   foreach (v ${blackhat_native_version})
-     LCG_add_test(blackhat-${v}.build
-        BINARY_DIR blackhat/tests/${v}
-        SOURCE_DIR blackhat/tests
-        BUILD all
-        BUILD_OPTIONS -DCMAKE_MODULE_PATH=${CMAKE_SOURCE_DIR}/cmake/modules
-                -DBLACKHAT_ROOT_DIR=${blackhat-${v}_home}
-                -DQD_ROOT_DIR=${qd_home}
- #  ENVIRONMENT ${library_path}=${blackhat-${v}_home}/lib:${qd_home}/lib:$ENV{${library_path}}
-    )
-
-    LCG_add_test(blackhat-${v}.native-cpp_example
-        TEST_COMMAND ${CMAKE_COMMAND} -E chdir blackhat/tests/${v} ./cpp_example
-        ENVIRONMENT ${library_path}=${blackhat-${v}_home}/lib:$ENV{${library_path}}
-        DEPENDS blackhat-${v}.build
-    )
-
-    LCG_add_test(blackhat-${v}.native-fortran_example
-        TEST_COMMAND ${CMAKE_COMMAND} -E chdir blackhat/tests/${v} ./fortran_example
-        ENVIRONMENT ${library_path}=${blackhat-${v}_home}/lib/blackhat:${qd_home}/lib:$ENV{${library_path}}
-        DEPENDS blackhat-${v}.build
-    )
-  endforeach()
-endif()
-
 #---openloops------------------------------------------------------------------
 ## TODO: clean from waste in INSTALL DIR
 LCGPackage_Add(
@@ -1608,64 +1026,6 @@ if("${Python_native_version}" VERSION_LESS 3)
   )
 endif()
 
-if("${Python_native_version}" VERSION_LESS 3)
-  set( v ${sherpa-mpich2_native_version})
-  LCG_add_test(sherpa-mpich2.native-LHC_Z
-    PRE_COMMAND ${CMAKE_COMMAND} -E remove_directory sherpa-mpi/native-LHC_Z/${v}
-      COMMAND ${CMAKE_COMMAND} -E make_directory sherpa-mpi/native-LHC_Z/${v}
-      COMMAND $ENV{SHELL} -c  "cd ${HOME} && touch .mpd.conf &&  chmod 600 .mpd.conf"
-  TEST_COMMAND ${CMAKE_COMMAND} -E chdir sherpa-mpi/native-LHC_Z/${v} ${mpich2_home}/bin/mpd --daemon
-    COMMAND ${mpich2_home}/bin/mpirun -n 5 ${sherpa-mpich2-${v}_home}/bin/Sherpa -f ${CMAKE_SOURCE_DIR}/generators/sherpa/tests/LHC_Z.dat
-    COMMAND ${mpich2_home}/bin/mpdallexit
-  ENVIRONMENT
-  ${library_path}=${sherpa-mpich2-${v}_home}/lib/SHERPA-MC:${HepMC_home}/lib:${lhapdf-${sherpa_mpich2-${v}_lhapdf}_home}/lib:${fastjet_home}/lib:${GSL_home}/lib:${sqlite_home}/lib:${mpich2_home}/lib:$ENV{${library_path}}
-    PATH=${sqlite_home}/bin:$ENV{PATH}
-    PWD=.
-  )
-endif()
-
-# $PWD is needed because Sherpa uses this variable to know current directory
-foreach(v ${sherpa_native_version})
-LCG_add_test(sherpa-${v}.native-LHC_Z
-  PRE_COMMAND ${CMAKE_COMMAND} -E remove_directory sherpa/native-LHC_Z/${v}
-      COMMAND ${CMAKE_COMMAND} -E make_directory sherpa/native-LHC_Z/${v}
-  TEST_COMMAND ${CMAKE_COMMAND} -E chdir sherpa/native-LHC_Z/${v} ${sherpa-${v}_home}/bin/Sherpa -j20 -f ${CMAKE_SOURCE_DIR}/generators/sherpa/tests/LHC_Z.dat
-  ENVIRONMENT
-  ${library_path}=${sherpa-${v}_home}/lib/SHERPA-MC:${HepMC_home}/lib:${lhapdf-${sherpa_${v}_lhapdf}_home}/lib:${fastjet_home}/lib:${GSL_home}/lib:${sqlite_home}/lib:$ENV{${library_path}}
-    PATH=${sqlite_home}/bin:$ENV{PATH}
-    PWD=.
-)
-
-LCG_add_test(sherpa-${v}.genser-LHC_Z_lhapdf
-  PRE_COMMAND ${CMAKE_COMMAND} -E remove_directory sherpa/genser-LHC_Z_lhapdf/${v}
-      COMMAND ${CMAKE_COMMAND} -E make_directory sherpa/genser-LHC_Z_lhapdf/${v}
-      COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/generators/sherpa/tests/LHC_Z_lhapdf.dat sherpa/genser-LHC_Z_lhapdf/LHC_Z_lhapdf.dat
-      IF ${sherpa_${v}_lhapdf} VERSION_LESS 6.0 THEN
-        COMMAND $ENV{SHELL} -c "sed -i -e 's/CT10/CT10.LHgrid/g' sherpa/genser-LHC_Z_lhapdf/LHC_Z_lhapdf.dat"
-      ENDIF
-  TEST_COMMAND ${CMAKE_COMMAND} -E chdir sherpa/genser-LHC_Z_lhapdf/${v} ${sherpa-${v}_home}/bin/Sherpa -f ${CMAKE_BINARY_DIR}/generators/sherpa/genser-LHC_Z_lhapdf/LHC_Z_lhapdf.dat
-  ENVIRONMENT
-    ${library_path}=${sherpa-${v}_home}/lib/SHERPA-MC:${HepMC_home}/lib:${lhapdf-${sherpa_${v}_lhapdf}_home}/lib:${fastjet_home}/lib:${GSL_home}/lib:${sqlite_home}/lib:$ENV{${library_path}}
-    LHAPDF_DATA_PATH=${lhapdf-${sherpa_${v}_lhapdf}_home}/share/LHAPDF:${CMAKE_INSTALL_PREFIX}/lhapdf6sets/current/share/LHAPDF
-    LHAPATH=${lhapdf-${sherpa_${v}_lhapdf}_home}/../share/PDFsets
-    PATH=${sqlite_home}/bin:$ENV{PATH}
-    PWD=.
-    DEPENDS lhapdf6sets.download
-)
-
-
-
-LCG_add_test(sherpa-${v}.native-LHC_ZJets
-  PRE_COMMAND ${CMAKE_COMMAND} -E remove_directory sherpa/native-LHC_ZJets/${v}
-      COMMAND ${CMAKE_COMMAND} -E make_directory sherpa/native-LHC_ZJets/${v}
-  TEST_COMMAND ${CMAKE_COMMAND} -E chdir sherpa/native-LHC_ZJets/${v} ${sherpa-${v}_home}/bin/Sherpa -j20 -f ${CMAKE_SOURCE_DIR}/generators/sherpa/tests/LHC_ZJets.dat
-  ENVIRONMENT
-    ${library_path}=${sherpa-${v}_home}/lib/SHERPA-MC:${HepMC_home}/lib:${lhapdf-${sherpa_${v}_lhapdf}_home}/lib:${fastjet_home}/lib:${GSL_home}/lib:${sqlite_home}/lib:$ENV{${library_path}}
-    PATH=${sqlite_home}/bin:$ENV{PATH}
-    PWD=.
-)
-endforeach()
-
 #---HepMCAnalysis------------------------------------------------------------------------------------
 LCGPackage_Add(
   hepmcanalysis
@@ -1685,41 +1045,6 @@ LCGPackage_Add(
 
 )
 
-foreach(v ${hepmcanalysis_native_version})
-LCG_add_test(hepmcanalysis-${v}.build
-  BINARY_DIR hepmcanalysis/tests/${v}
-  SOURCE_DIR hepmcanalysis/tests
-  BUILD all
-  BUILD_OPTIONS
-   -DCMAKE_MODULE_SEARCHPATH1=${CMAKE_SOURCE_DIR}/cmake/modules
-   -DCMAKE_MODULE_SEARCHPATH2=${CMAKETOOLS_MODULES}
-   -DHEPMCANALYSIS_ROOT_DIR=${hepmcanalysis-${v}_home}
-   -DPYTHIA6_ROOT_DIR=${pythia6_home}
-   -DHEPMC_ROOT_DIR=${HepMC_home}
-   -DFASTJET_ROOT_DIR=${fastjet_home}
-   -DROOTSYS=${ROOT_home}
-   -DLHAPDF_ROOT_DIR=${lhapdf_home}
-   -DCLHEP_ROOT_DIR=${clhep_home}
-  IF LCGCMAKE_CXX_STANDARD_FLAG  THEN -DCMAKE_CXX_FLAGS=${LCGCMAKE_CXX_STANDARD_FLAG} ENDIF
-  ENVIRONMENT ${library_path}=${ROOT_home}/lib:${fastjet_home}/lib:${clhep_home}/lib:${HepMC_home}/lib:${pythia6_home}/lib:$ENV{${library_path}})
-
-
-LCG_add_test(hepmcanalysis-${v}.native-pythia6
-   TEST_COMMAND hepmcanalysis/tests/${v}/native-pythia6 ${hepmcanalysis-${v}_home}/../share/sources/examples/pythia6/Process.config
-   DEPENDS hepmcanalysis-${v}.build
-   ENVIRONMENT ${library_path}=${hepmcanalysis-${v}_home}/lib:${ROOT_home}/lib:${fastjet_home}/lib:${clhep_home}/lib:${HepMC_home}/lib:${pythia6_home}/lib:$ENV{${library_path}}
-)
-
-LCG_add_test(hepmcanalysis-${v}.native-hepmcreader
-    BINARY_DIR hepmcanalysis/tests/${v}
-    PRE_COMMAND ${CMAKE_COMMAND} -E create_symlink ${hepmcanalysis-${v}_home}/../share/sources/examples/hepmcreader/Process.config Process.config
-        COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_SOURCE_DIR}/generators/rivet/tests/data.hepmc sample1.input
-    TEST_COMMAND hepmcanalysis/tests/${v}/native-hepmcreader Process.config
-    DEPENDS hepmcanalysis-${v}.build
-    ENVIRONMENT ${library_path}=${hepmcanalysis-${v}_home}/lib:${ROOT_home}/lib:${fastjet_home}/lib:${clhep_home}/lib:${HepMC_home}/lib:${pythia6_home}/lib:$ENV{${library_path}}
-)
-endforeach()
-
 #---MC-TESTER----------------------------------------------------------------------------------------
 LCGPackage_Add(mctester
   URL ${gen_url}/MC-TESTER-${mctester_native_version}.tar.gz
@@ -1750,18 +1075,7 @@ if(NOT APPLE)    #  (installation fails on MacOSX, can be fixed on macos)
        	  COMMAND ${CMAKE_COMMAND} -E copy  <SOURCE_DIR>/tmp/pyhidata.o <INSTALL_DIR>/lib
     BUILD_IN_SOURCE 1
 )
-
-foreach(v ${hijing_native_version})
-LCG_add_test(hijing-${v}.native-example1-nopause TEST_COMMAND hijing/tests/${v}/hijing_orig_example1-nopause
-                          BINARY_DIR hijing/tests/${v}
-                          SOURCE_DIR hijing/tests
-                          BUILD hijing_orig_example1-nopause
-                          BUILD_OPTIONS -DHIJING_ROOT_DIR=${hijing-${v}_home}
-                                        -DCMAKE_MODULE_PATH=${CMAKETOOLS_MODULES}
-                          ENVIRONMENT ${library_path}=${hijing-${v}_home}/lib:$ENV{${library_path}})
-endforeach()
 endif()
-
 #---Starlight---------------------------------------------------------------------------------------
 LCGPackage_Add(
   starlight
@@ -1774,13 +1088,6 @@ LCGPackage_Add(
   CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR> "-DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS} -Wno-array-parameter -Wno-unused-but-set-variable -Wno-unknown-warning-option"
 )
 
-foreach(v ${starlight_native_version})
-LCG_add_test(starlight-${v}.native-slight
-  PRE_COMMAND ${CMAKE_COMMAND} -E remove -f slight.in
-      COMMAND ${CMAKE_COMMAND} -E create_symlink ${starlight-${v}_home}/../share/sources/config/slight.in slight.in
-  TEST_COMMAND ${starlight-${v}_home}/bin/starlight)
-endforeach()
-
 #---HERWIG----------------------------------------------------------------------------------------
 LCGPackage_Add(
   herwig
@@ -1795,18 +1102,6 @@ LCGPackage_Add(
   BUILD_IN_SOURCE 1
 )
 
-foreach(v ${herwig_native_version})
-LCG_add_test(herwig-${v}.build
-  BINARY_DIR herwig/tests/${v}
-  SOURCE_DIR herwig/tests
-  BUILD all
-  BUILD_OPTIONS -DCMAKE_MODULE_PATH=${CMAKE_SOURCE_DIR}/cmake/modules
-                -DCMAKE_MODULE_PATH2=${CMAKETOOLS_MODULES}
-                -DHERWIG_ROOT_DIR=${herwig-${v}_home}
-                -DHEPMC_ROOT_DIR=${HepMC_home}
-)
-endforeach()
-
 #---tauola------------------------------------------------------------------------------------------
 if(NOT APPLE)    #  (installation fails on MacOSX)
   LCGPackage_Add(
@@ -1829,19 +1124,6 @@ if(NOT APPLE)    #  (installation fails on MacOSX)
     BUILD_IN_SOURCE 1
     DEPENDS photos pythia6
   )
-
-foreach(v ${tauola_native_version})
-  LCG_add_test(tauola-${v}.genser-test TEST_COMMAND tauola/tests/${v}/tauola_test1
-                          BINARY_DIR tauola/tests/${v}
-                          SOURCE_DIR tauola/tests
-                          BUILD tauola_test1
-                          BUILD_OPTIONS -DTAUOLA_ROOT_DIR=${tauola-${v}_home}
-                                        -DPHOTOS_ROOT_DIR=${photos_home}
-                                        -DPYTHIA6_ROOT_DIR=${pythia6_home}
-                                        -DCMAKE_MODULE_PATH=${CMAKETOOLS_MODULES}
-                          ENVIRONMENT ${library_path}=${tauola-${v}_home}/lib:${photos_home}/lib:${pythia6_home}/lib:$ENV{${library_path}})
-endforeach()
-
 endif()
 
 #---SFGen------------------------------------------------------------------------------------------
@@ -1907,22 +1189,6 @@ LCGPackage_Add(
   BUILD_IN_SOURCE 1
 )
 
-foreach(v ${alpgen_native_version})
-LCG_add_test(
-  alpgen-${v}.native-examples
-  PRE_COMMAND ${CMAKE_COMMAND} -E remove_directory tmpalpgen
-      COMMAND ${CMAKE_COMMAND} -E make_directory tmpalpgen/examples-${v}
-      COMMAND ${CMAKE_COMMAND} -E copy_directory ${alpgen-${v}_home}/../share/sources/examples tmpalpgen/examples-${v}
-      COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/generators/alpgen/tests/inputalpgen tmpalpgen/examples-${v}
-      COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/generators/alpgen/tests/inputalpgen2 tmpalpgen/examples-${v}
-      COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/generators/alpgen/tests/inputalpgen3 tmpalpgen/examples-${v}
-  TEST_COMMAND ${CMAKE_COMMAND} -E chdir tmpalpgen/examples-${v} $ENV{SHELL} -c "./configure_simple --with-alpgeninstalled=${alpgen-${v}_home}/../share/sources --with-alpgenlibs=${alpgen-${v}_home}/lib/archive
-               make -f Makefile_simple zjet
-               ./zjetgen.exe < inputalpgen
-               ./zjetgen.exe < inputalpgen2"
-)
-endforeach()
-
 #---CRMC (FORMER EPOS)-----------------------------------------------------------------------------
 # SVN repository:
 #   https://devel-ik.fzk.de/svn/mc/crmc/tags/{version}
@@ -1936,22 +1202,6 @@ if(NOT APPLE)    #  (installation fails on MacOSX)
     BUILD_IN_SOURCE 1
     DEPENDS HepMC
   )
-
-  # add test only if version is defined in toolchain configuration
-foreach(v ${crmcold_native_version})
-  if(NOT ${crmcold-${v}_home} STREQUAL "")
-   if (NOT shell_ext MATCHES "csh")
-    LCG_add_test(crmcold-${v}.genser-scripts
-      TEST_COMMAND $ENV{SHELL} -c "source ${crmcold-${v}_home}/crmcoldenv-genser.sh
-        crmc -T 1 -c ${crmcold-${v}_home}/crmc.param"
-    )
-   endif()
-    LCG_add_test(crmcold-${v}.native-crmc
-      TEST_COMMAND ${crmcold-${v}_home}/bin/crmc -T 1 -c ${crmcold-${v}_home}/crmc.param
-      ENVIRONMENT ${library_path}=${HepMC_home}/lib:$ENV{${library_path}}
-    )
-  endif()
-endforeach()
 endif()
 
 if(NOT APPLE)    #  (installation fails on MacOSX)
@@ -2009,18 +1259,6 @@ if(NOT APPLE)    #  (installation fails on MacOSX)
     REVISION 1
   )
 
-foreach(v ${crmc_native_version})
- if (NOT shell_ext MATCHES "csh")
-  LCG_add_test(crmc-${v}.genser-scripts
-    TEST_COMMAND $ENV{SHELL} -c "source ${crmc-${v}_home}/crmcenv-genser.sh
-      crmc -T 1 -c ${crmc-${v}_home}/crmc.param"
-  )
- endif()
-  LCG_add_test(crmc-${v}.native-crmc
-    TEST_COMMAND ${crmc-${v}_home}/bin/crmc -T 1 -c ${crmc-${v}_home}/crmc.param
-    ENVIRONMENT ${library_path}=${crmc-${v}_home}/lib:${ROOT_home}/lib:${HepMC_home}/lib:${Boost_home}/lib:$ENV{${library_path}}
-  )
-endforeach()
 endif()
 
 #---FeynHiggs--------------------------------------------------------------------------------------
@@ -2062,18 +1300,6 @@ if(NOT APPLE)    #  (installation fails on MacOSX)
   REVISION 1
 )
 
-foreach(v ${powheg-box-v2_native_version})
-foreach(i WW Zj hvq)
-  LCG_add_test(powheg-box-v2-${v}.native-${i}
-    TEST_COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/powheg-box/tests/runtest.sh ${powheg-box-v2-${v}_home}/bin ${powheg-box-v2-${v}_home}/../share/sources ${i} powheg-box-v2 ${v}
-    ENVIRONMENT
-      ${library_path}=${lhapdf-${powheg-box-v2_${v}_lhapdf}_home}/lib:${fastjet_home}/lib:$ENV{${library_path}}
-      LHAPATH=${lhapdfsets_home}/../share/PDFsets
-      LHAPDF_DATA_PATH=${lhapdf-${powheg-box-v2_${v}_lhapdf}_home}/share/LHAPDF:${CMAKE_INSTALL_PREFIX}/lhapdf6sets/current/share/LHAPDF
-    DEPENDS lhapdf6sets.download
-  )
-endforeach()
-endforeach()
 endif()
 
 #---powheg-box-------------------------------------------------------------------------------
@@ -2092,21 +1318,6 @@ if(NOT APPLE)    #  (installation fails on MacOSX)
   DEPENDS fastjet lhapdf
  )
 
-foreach(v ${powheg-box_native_version})
-if (NOT $v MATCHES "rdynamic")
-# WZ, Wp_Wp_J_J, VBF_Wp_Wp are skiped - example steering files do not work
-foreach(i WW HJ W_ew-BW Wbb Wj HJJ ZZ W_ew-BMNNP Dijet gg_H VBF_H Z W hvq Zj ST_sch ST_tch ST_tch_4f)
-  LCG_add_test(powheg-box-${v}.native-${i}
-    TEST_COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/powheg-box/tests/runtest.sh ${powheg-box-${v}_home}/bin ${powheg-box-${v}_home}/../share/sources ${i} powheg-box ${v}
-    ENVIRONMENT
-      ${library_path}=${lhapdf-${powheg-box_${v}_lhapdf}_home}/lib:${fastjet_home}/lib:$ENV{${library_path}}
-      LHAPATH=${lhapdfsets_home}/../share/PDFsets
-      LHAPDF_DATA_PATH=${lhapdf-${powheg-box_${v}_lhapdf}_home}/share/LHAPDF:${CMAKE_INSTALL_PREFIX}/lhapdf6sets/current/share/LHAPDF
-    DEPENDS lhapdf6sets.download
-  )
-endforeach()
-endif()
-endforeach()
 endif()
 
 #---sacrifice------------------------------------------------------------------------------------------
@@ -2134,24 +1345,6 @@ LCGPackage_Add(
           IF LCG_TARGET MATCHES mac THEN automake autoconf libtool ENDIF
 )
 
-foreach(v ${sacrifice_native_version})
-if (NOT shell_ext MATCHES "csh")
-LCG_add_test(sacrifice-${v}.genser-scripts
-  TEST_COMMAND $ENV{SHELL} -c "source ${sacrifice-${v}_home}/sacrificeenv-genser.sh
-    run-pythia  --collision-energy 8000 -i ${CMAKE_SOURCE_DIR}/generators/sacrifice/AU2-CT10.params -n 1000 --photos"
-  ENVIRONMENT LHAPDF_DATA_PATH=${lhapdf-${sacrifice_${v}_lhapdf}_home}/share/LHAPDF:${CMAKE_INSTALL_PREFIX}/lhapdf6sets/current/share/LHAPDF
-  DEPENDS lhapdf6sets.download
-)
-endif()
-LCG_add_test(sacrifice-${v}.genser-AU2-CT10
-   TEST_COMMAND ${sacrifice-${v}_home}/bin/run-pythia  --collision-energy 8000 -i ${CMAKE_SOURCE_DIR}/generators/sacrifice/AU2-CT10.params -n 1000 --photos
-   ENVIRONMENT ${library_path}=${photos++_home}/lib:${lhapdf-${sacrifice_${v}_lhapdf}_home}/lib:${HepMC_home}/lib:${pythia8-${sacrifice_${v}_pythia8}_home}/lib:$ENV{${library_path}}
-	       LHAPATH=${lhapdfsets_home}/../share/lhapdf/PDFsets
-               LHAPDF_DATA_PATH=${lhapdf-${sacrifice_${v}_lhapdf}_home}/share/LHAPDF:${CMAKE_INSTALL_PREFIX}/lhapdf6sets/current/share/LHAPDF
-   DEPENDS lhapdf6sets.download
-   )
-endforeach()
-
 #---baurmc------------------------------------------------------------------------------------------
 if(NOT APPLE)    #  (installation fails on MacOSX)
 if ( (${LCG_COMP} STREQUAL gcc AND ${LCG_COMPVERS} VERSION_GREATER 9) OR 
@@ -2292,66 +1485,6 @@ LCGPackage_Add(
     ENDIF
 )
 
-foreach(v ${madgraph5amc_native_version})
-#LCG_add_test(madgraph5amc_testmanager
-#  TEST_COMMAND ${Python_cmd} ${madgraph5amc-${v}_home}/tests/test_manager.py
-#)
-
-LCG_add_test(madgraph5amc-${v}.genser-zjetsLO
-  PRE_COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/generators/madgraph5amc/${v}/LO
-#        The two lines below will not work for madgraph5amc installed in readonly location
-       COMMAND $ENV{SHELL} -c "echo set fastjet ${fastjet_home}/bin/fastjet-config > ${CMAKE_BINARY_DIR}/generators/madgraph5amc/${v}/cardsLO.dat"
-       COMMAND $ENV{SHELL} -c "echo set lhapdf ${lhapdf_home}/bin/lhapdf-config >> ${CMAKE_BINARY_DIR}/generators/madgraph5amc/${v}/cardsLO.dat"
-       COMMAND $ENV{SHELL} -c "cat ${CMAKE_SOURCE_DIR}/generators/madgraph5amc/tests/cardsLO.dat >> ${CMAKE_BINARY_DIR}/generators/madgraph5amc/${v}/cardsLO.dat"
-  TEST_COMMAND $ENV{SHELL} -c "cd ${CMAKE_BINARY_DIR}/generators/madgraph5amc/${v}/LO
-           ${Python_cmd} ${madgraph5amc-${v}_home}/bin/mg5_aMC ${CMAKE_BINARY_DIR}/generators/madgraph5amc/${v}/cardsLO.dat
-           MYPROC/bin/generate_events < ${CMAKE_SOURCE_DIR}/generators/madgraph5amc/tests/cardsLO1"
-)
-
-LCG_add_test(madgraph5amc-${v}.genser-zjetsLOLHAPDF
-  TEST_COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/generators/madgraph5amc/${v}/LOLHAPDF
-       COMMAND $ENV{SHELL} -c "cd ${CMAKE_BINARY_DIR}/generators/madgraph5amc/${v}/LOLHAPDF
-           ${Python_cmd} ${madgraph5amc-${v}_home}/bin/mg5_aMC ${CMAKE_SOURCE_DIR}/generators/madgraph5amc/tests/cardsLO.dat
-           sed -i.bck -e 's@.*lhapdf = lhapdf-config@ lhapdf = ${lhapdf_home}/bin/lhapdf-config@' MYPROC/Cards/me5_configuration.txt
-           sed -i.bck -e '/= pdlabel/s@^.*$@ lhapdf = pdlabel@' -e '/= lhaid/s@^.*$@ 10800 = lhaid@' MYPROC/Cards/run_card.dat
-           MYPROC/bin/generate_events < ${CMAKE_SOURCE_DIR}/generators/madgraph5amc/tests/cardsLO1"
-  ENVIRONMENT
-     LHAPDF_DATA_PATH=${CMAKE_INSTALL_PREFIX}/lhapdf6sets/current/share/LHAPDF
-  DEPENDS lhapdf6sets.download madgraph5amc-${v}.genser-zjetsLO
-)
-
-LCG_add_test(madgraph5amc-${v}.genser-zjetsLO_hadronize
-  PRE_COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/generators/madgraph5amc/${v}/hadronization
-      COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/generators/pythia8/tests/pythia8_test2.cmnd ${CMAKE_BINARY_DIR}/generators/madgraph5amc/${v}/hadronization
-      COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/generators/madgraph5amc/${v}/LO/MYPROC/Events/run_01/unweighted_events.lhe.gz ${CMAKE_BINARY_DIR}/generators/madgraph5amc/${v}/hadronization/Zg_pythia8_mg.lhe.gz
-      COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_BINARY_DIR}/generators/madgraph5amc/${v}/hadronization/Zg_pythia8_mg.lhe
-      COMMAND ${CMAKE_COMMAND} -E chdir ${CMAKE_BINARY_DIR}/generators/madgraph5amc/${v}/hadronization gunzip Zg_pythia8_mg.lhe.gz
-#       Old pythia8 does not accept lhe version 3.0:
-      IF pythia8_work_version MATCHES "HEAD" OR pythia8_work_version VERSION_GREATER 204 THEN
-        COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/generators/madgraph5amc/${v}/hadronization/Zg_pythia8_mg.lhe ${CMAKE_BINARY_DIR}/generators/madgraph5amc/${v}/hadronization/Zg_pythia8.lhe
-      ELSE
-        COMMAND $ENV{SHELL} -c "cat ${CMAKE_BINARY_DIR}/generators/madgraph5amc/${v}/hadronization/Zg_pythia8_mg.lhe | sed '/LesHouchesEvents/s/3.0/1.0/' > ${CMAKE_BINARY_DIR}/generators/madgraph5amc/${v}/hadronization/Zg_pythia8.lhe"
-      ENDIF
-  TEST_COMMAND ${CMAKE_COMMAND} -E chdir ${CMAKE_BINARY_DIR}/generators/madgraph5amc/${v}/hadronization ${CMAKE_BINARY_DIR}/generators/pythia8/tests/${pythia8_work_version}/pythia8_genser_test2
-  ENVIRONMENT
-    ${library_path}=${pythia8-${pythia8_work_version}_home}/lib:${HepMC_home}/lib:$ENV{${library_path}}
-    IF pythia8_work_version MATCHES "HEAD81" OR pythia8_work_version MATCHES "^1[0-9][0-9]" THEN
-      PYTHIA8DATA=${pythia8_home}/xmldoc
-    ELSE
-      PYTHIA8DATA=${pythia8_home}/share/Pythia8/xmldoc
-    ENDIF
-  DEPENDS pythia8-${pythia8_work_version}.build madgraph5amc-${v}.genser-zjetsLOLHAPDF
-)
-
-LCG_add_test(madgraph5amc-${v}_compare
-  TEST_COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/generators/pythia8/tests/compare/chi.c ${CMAKE_BINARY_DIR}/generators/madgraph5amc/${v}/hadronization/.
-       COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/generators/madgraph5amc/${v}/hadronization/testi_pythia8.dat ${CMAKE_BINARY_DIR}/generators/madgraph5amc/${v}/hadronization/test_madgraph5amc.dat
-       COMMAND ${CMAKE_COMMAND} -E chdir ${CMAKE_BINARY_DIR}/generators/madgraph5amc/${v}/hadronization ${CMAKE_SOURCE_DIR}/generators/pythia8/tests/compare/cmpr.sh madgraph5amc ${CMAKE_SOURCE_DIR}/generators/madgraph5amc/tests/reference.dat ${v} ${LCG_VERSION} ${LCG_platform} ${CMAKE_SOURCE_DIR}/generators/pythia8
-  DEPENDS madgraph5amc-${v}.genser-zjetsLO_hadronize
-)
-
-endforeach()
-
 #--- JHU -------------------------------------------------------------------------------------------
 LCGPackage_Add(
   jhu
@@ -2377,39 +1510,6 @@ LCGPackage_Add(
   BUILD_IN_SOURCE 1
 )
 
-if (jhu_native_version)
-set(sorted_jhu_versions ${jhu_native_version})
-list(SORT sorted_jhu_versions)
-list(GET sorted_jhu_versions -1 last_jhu_version)
-LCG_add_test(jhu.prepare-pdfs
-  TEST_COMMAND ${CMAKE_COMMAND} -E remove -f pdfs
-       COMMAND ${CMAKE_COMMAND} -E create_symlink ${jhu-${last_jhu_version}_home}/pdfs pdfs
-       COMMAND echo ln -s ${jhu-${last_jhu_version}_home}/pdfs pdfs
-       COMMAND ls pdfs
-       COMMAND $ENV{SHELL} -c "cd pdfs && test -s downloadNNPDF.sh && bash ./downloadNNPDF.sh"
-)
-endif()
-foreach(v ${jhu_native_version})
-if (NOT shell_ext MATCHES "csh")
-LCG_add_test(jhu-${v}.genser-scripts
-  TEST_COMMAND $ENV{SHELL} -c "source ${jhu-${v}_home}/jhuenv-genser.sh
-    cd \$JHU_HOME
-    JHUGen VegasNc0=100000 VegasNc1=500000 VegasNc2=100"
-)
-endif()
-
-LCG_add_test(jhu-${v}.native-JHUGen
-  TEST_COMMAND ${jhu-${v}_home}/bin/JHUGen VegasNc0=100000 VegasNc1=500000 VegasNc2=100)
-
-LCG_add_test(jhu-${v}.native-testF
-  TEST_COMMAND ${jhu-${v}_home}/bin/testF
-  DEPENDS jhu.prepare-pdfs)
-
-LCG_add_test(jhu-${v}.native-testC
-  TEST_COMMAND ${jhu-${v}_home}/bin/testC
-  DEPENDS jhu.prepare-pdfs)
-endforeach()
-
 #---LoopTools------------------------------------------------------------------------------------------------
 LCGPackage_Add(
   looptools
@@ -2436,17 +1536,6 @@ LCGPackage_Add(
   DEPENDS ftjam looptools omniorb lhapdf-${lhapdf6_latest_version}
 )
 
-#foreach(v ${gg2VV_native_version})
-#  LCG_add_test(gg2VV-${v}.native
-#    TEST_COMMAND ${gg2VV-${v}_home}/bin/gg2VV
-#    ENVIRONMENT
-#      LHAPDF_DATA_PATH=${lhapdf_home}/share/LHAPDF:${CMAKE_INSTALL_PREFIX}/lhapdf6sets/current/share/LHAPDF
-#      ${library_path}=${lhapdf_home}/lib:${omniorb_home}/lib:$ENV{${library_path}}
-#    TIMEOUT 3000
-#    DEPENDS lhapdf6sets.download
-#  )
-#endforeach()
-
 #--- fastnlo_toolkit -------------------------------------------------------------------------------
 LCGPackage_Add(
   fastnlo_toolkit
@@ -2464,284 +1553,6 @@ LCGPackage_Add(
   DEPENDS lhapdf yoda fastjet
 )
 
-# List of .tab files is available on http://fastnlo.hepforge.org/scenarios/tables-lhc.html
-
-if (UNIX AND fastnlo_toolkit_native_version)
-
-# CMS inclusive forward jets 2011 (anti-kT R=0.5; pT, eta); LO, NLO; RIVET_ID: CMS_2012_I1087342
-set(fastnlo_toolkit_tabfile "fnl2222b_I1087342.tab")
-LCG_add_test(fastnlo_toolkit.download
-  TEST_COMMAND $ENV{SHELL} -c "curl http://fastnlo.hepforge.org/scenarios/tables-v21/${fastnlo_toolkit_tabfile}.gz | gzip -d | cat > ${fastnlo_toolkit_tabfile}")
-
-if (NOT shell_ext MATCHES "csh")
-foreach(v ${fastnlo_toolkit_native_version})
- foreach(fnlotest "example" "yodaout" "cppread")
-  LCG_add_test(fastnlo_toolkit-${v}.native-fnlo-tk-${fnlotest}
-  IF ${fastnlo_toolkit_${v}_lhapdf} VERSION_LESS 6.0 THEN
-       TEST_COMMAND $ENV{SHELL} -c "source ${fastnlo_toolkit-${v}_home}/fastnlo_toolkitenv-genser.sh \n fnlo-tk-${fnlotest} ${fastnlo_toolkit_tabfile} CT10nnlo.LHgrid"
-  ELSE
-       TEST_COMMAND $ENV{SHELL} -c "source ${fastnlo_toolkit-${v}_home}/fastnlo_toolkitenv-genser.sh \n fnlo-tk-${fnlotest} ${fastnlo_toolkit_tabfile} CT10nnlo"
-  ENDIF
-  ENVIRONMENT
-     LHAPDF_DATA_PATH=${lhapdf-${fastnlo_toolkit_${v}_lhapdf}_home}/share/LHAPDF:${CMAKE_INSTALL_PREFIX}/lhapdf6sets/current/share/LHAPDF
-     LHAPATH=${lhapdf-${fastnlo_toolkit_${v}_lhapdf}_home}/../share/PDFsets
-
-  DEPENDS fastnlo_toolkit.download lhapdf6sets.download
-  )
- endforeach()
-endforeach()
-endif(NOT shell_ext MATCHES "csh")
-endif(UNIX AND fastnlo_toolkit_native_version)
-
-
-### tests of generators using rivet 2
-
-if(rivet2_work_version VERSION_EQUAL 2.2.0 OR rivet2_work_version VERSION_GREATER 2.2.0)
- LCG_add_test(rivet-tests.genser-buildanalysis
-  TEST_COMMAND $ENV{SHELL} -c "source ${rivet2_home}/rivetenv.${shell_ext}
-       rivet-buildplugin RivetGENSER_MC_ZJETS.so ${CMAKE_SOURCE_DIR}/generators/rivetgenser/GENSER_MC_ZJETS.cc"
-       COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/generators/rivetgenser/GENSER_MC_ZJETS.info ${CMAKE_BINARY_DIR}/generators
-       COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/generators/rivetgenser/GENSER_MC_ZJETS.plot ${CMAKE_BINARY_DIR}/generators
-  ENVIRONMENT
-    ${library_path}=${GSL_home}/lib:$ENV{${library_path}}
-    LIBRARY_PATH=${fastjet_home}/lib:$ENV{LIBRARY_PATH}
-    PATH=${Python_home}/bin:$ENV{PATH}
- )
-endif()
-
-foreach(v ${pythia8_native_version})
- if(rivet2_work_version VERSION_EQUAL 2.2.0 OR rivet2_work_version VERSION_GREATER 2.2.0)
- LCG_add_test(
-  pythia8-${v}.genser-zjetsgenser-rivet
-  PRE_COMMAND $ENV{SHELL} -c "cat ${CMAKE_SOURCE_DIR}/generators/pythia8/tests/pythia8-zjets-rivet.params | sed \"s/Main:numberOfEvents.*/Main:numberOfEvents = ${rivettests_stat_size}/g\" | cat > ${CMAKE_BINARY_DIR}/generators/pythia8/tests/pythia8-${v}.zjetsgenser-rivet.params"
-  TEST_COMMAND ${CMAKE_BINARY_DIR}/generators/pythia8/tests/${v}/pythia8 ${CMAKE_BINARY_DIR}/generators/pythia8/tests/pythia8-${v}.zjetsgenser-rivet.params pythia8-${v}.genser-zjetsgenser.hempc.dat
-       COMMAND ${rivet2_home}/bin/rivet --show-analysis GENSER_MC_ZJETS
-       COMMAND ${rivet2_home}/bin/rivet -a MC_XS -a GENSER_MC_ZJETS -a MC_GENERIC -a MC_IDENTIFIED --histo-file=pythia8-${v}.genser-zjetsgenser-rivet.yoda pythia8-${v}.genser-zjetsgenser.hempc.dat
-  ENVIRONMENT PATH=${Python_home}/bin:$ENV{PATH}
-              ${library_path}=${Python_home}/lib:${GSL_home}/lib:${rivet2_home}/lib:${yoda_home}/lib:${HepMC_home}/lib:${fastjet_home}/lib:${yamlcpp_home}/lib:${ROOT_home}/lib:${pythia8-${v}_home}/lib:$ENV{${library_path}}
-              PYTHONPATH=${Python_home}/bin:${rivet2_home}/lib/python${Python_config_version_twodigit}/site-packages/:${yoda_home}/lib/python${Python_config_version_twodigit}/site-packages/:${ROOT_home}/lib:${pyanalysis_home}/lib/python${Python_config_version_twodigit}/site-packages:$ENV{PYTHONPATH}
-              IF v MATCHES "HEAD81" OR v MATCHES "^1[0-9][0-9]" THEN
-                PYTHIA8DATA=${pythia8-${v}_home}/xmldoc
-              ELSE
-                PYTHIA8DATA=${pythia8-${v}_home}/share/Pythia8/xmldoc
-              ENDIF
-              RIVET_ANALYSIS_PATH=${CMAKE_BINARY_DIR}/generators
-  POST_COMMAND ${CMAKE_COMMAND} -DAIDA2ROOT=${AIDA2ROOT} -DPython_cmd=${Python_cmd} -Dyoda_home=${yoda_home} -DINPUT=${CMAKE_BINARY_DIR}/generators/pythia8-${v}.genser-zjetsgenser-rivet.yoda -P ${CMAKE_SOURCE_DIR}/cmake/scripts/yoda2root.cmake
-       COMMAND ${CMAKE_SOURCE_DIR}/generators/reference/riv2html.sh ${rivet2_home} pythia8 ${v} zjetsgenser ${LCG_VERSION} ${LCG_platform}
-       COMMAND ${Python_cmd} ${CMAKE_SOURCE_DIR}/generators/reference/reference.py ${CMAKE_BINARY_DIR}/generators/pythia8.genser-zjetsgenser-rivet.root ${CMAKE_BINARY_DIR}/generators/pythia8-${v}.genser-zjetsgenser-rivet.root "Path=XS,Z_pt,jet_mult,jet_mult_norm,jet1_pt,jet2_pt" "limit=0.05,0.1,0.1,0.04,0.1,0.1"
-  TIMEOUT ${timeout}
-  DEPENDS rivet-tests.genser-prepare_references rivet-tests.genser-buildanalysis pythia8-${v}.build
- )
- endif()
-endforeach()
-
-### PYTHIA 6 RIVET TESTS
-foreach (v ${pythia6_native_version})
- string(REGEX MATCH "[0-9][0-9][0-9]" v_test_version ${v})
- LCG_add_test(
-  pythia6-${v}.genser-ttbar-rivet
-  TEST_COMMAND ${agile_home}/bin/agile-runmc --list-gens
-       COMMAND ${agile_home}/bin/agile-runmc Pythia6:${v_test_version} -o pythia6-${v}.genser-ttbar.hepmc.dat --paramfile=${CMAKE_SOURCE_DIR}/generators/agile_configs/pythia6-ttbar-8tev.params -n ${rivettests_stat_size}
-       COMMAND ${rivet2_home}/bin/rivet -a MC_GENERIC -a MC_IDENTIFIED -a MC_XS -a MC_TTBAR --histo-file=pythia6-${v}.genser-ttbar-rivet.yoda pythia6-${v}.genser-ttbar.hepmc.dat
-  ENVIRONMENT PATH=${agile_home}/bin:${Python_home}/bin:$ENV{PATH}
-              ${library_path}=${Python_home}/lib:${GSL_home}/lib:${rivet2_home}/lib:${yoda_home}/lib:${HepMC_home}/lib:${fastjet_home}/lib:${yamlcpp_home}/lib:${agile_home}/lib:${HepMC_home}/lib:${ROOT_home}/lib:$ENV{${library_path}}
-              PYTHONPATH=${Python_home}/bin:${agile_home}/lib/python${Python_config_version_twodigit}/site-packages:${yoda_home}/lib/python${Python_config_version_twodigit}/site-packages/:${rivet2_home}/lib/python${Python_config_version_twodigit}/site-packages:${ROOT_home}/lib:${pyanalysis_home}/lib/python${Python_config_version_twodigit}/site-packages:$ENV{PYTHONPATH}
-              AGILE_GEN_PATH=${agile_home}/../../..
-  POST_COMMAND ${CMAKE_COMMAND} -DAIDA2ROOT=${AIDA2ROOT} -DPython_cmd=${Python_cmd} -Dyoda_home=${yoda_home} -DINPUT=${CMAKE_BINARY_DIR}/generators/pythia6-${v}.genser-ttbar-rivet.yoda -P ${CMAKE_SOURCE_DIR}/cmake/scripts/yoda2root.cmake
-       COMMAND ${Python_cmd} ${CMAKE_SOURCE_DIR}/generators/reference/reference.py ${CMAKE_BINARY_DIR}/generators/pythia6.genser-ttbar-rivet.root ${CMAKE_BINARY_DIR}/generators/pythia6-${v}.genser-ttbar-rivet.root "Path=XS,jet_HT,jet_mult" "limit=0.05,0.10,0.10"
-  TIMEOUT ${timeout}
-  DEPENDS rivet-tests.genser-prepare_references
- )
-
- LCG_add_test(
-  pythia6-${v}.genser-zjetsgenser-rivet
-  TEST_COMMAND pythia6/tests/${v}/pythia6_genser_outhepmc ${rivettests_stat_size} pythia6-${v}.genser-zjets.hepmc.dat
-       COMMAND $ENV{SHELL} -c "cat pythia6-${v}.genser-zjets.hepmc.dat | sed 's/U MEV MM/U GEV MM/' > pythia6-${v}.genser-zjets.hepmc.datNEW"
-       COMMAND $ENV{SHELL} -c "mv pythia6-${v}.genser-zjets.hepmc.datNEW pythia6-${v}.genser-zjets.hepmc.dat"
-       COMMAND ${rivet2_home}/bin/rivet -a MC_XS -a GENSER_MC_ZJETS -a MC_GENERIC -a MC_IDENTIFIED --histo-file=pythia6-${v}.genser-zjetsgenser-rivet.yoda pythia6-${v}.genser-zjets.hepmc.dat
-  ENVIRONMENT PATH=${Python_home}/bin:$ENV{PATH}
-              ${library_path}=${Python_home}/lib:${GSL_home}/lib:${rivet2_home}/lib:${yoda_home}/lib:${HepMC_home}/lib:${fastjet_home}/lib:${yamlcpp_home}/lib:${pythia6-${v}_home}/lib:${HepMC_home}/lib:${ROOT_home}/lib:$ENV{${library_path}}
-              PYTHONPATH=${Python_home}/bin:${agile_home}/lib/python${Python_config_version_twodigit}/site-packages:${rivet2_home}/lib/python${Python_config_version_twodigit}/site-packages:${yoda_home}/lib/python${Python_config_version_twodigit}/site-packages/:${ROOT_home}/lib:${pyanalysis_home}/lib/python${Python_config_version_twodigit}/site-packages:$ENV{PYTHONPATH}
-              RIVET_ANALYSIS_PATH=${CMAKE_BINARY_DIR}/generators
-  POST_COMMAND ${CMAKE_COMMAND} -DAIDA2ROOT=${AIDA2ROOT} -DPython_cmd=${Python_cmd} -Dyoda_home=${yoda_home} -DINPUT=${CMAKE_BINARY_DIR}/generators/pythia6-${v}.genser-zjetsgenser-rivet.yoda -P ${CMAKE_SOURCE_DIR}/cmake/scripts/yoda2root.cmake
-       COMMAND ${CMAKE_SOURCE_DIR}/generators/reference/riv2html.sh ${rivet2_home} pythia6 ${v} zjetsgenser ${LCG_VERSION} ${LCG_platform}
-       COMMAND ${Python_cmd} ${CMAKE_SOURCE_DIR}/generators/reference/reference.py ${CMAKE_BINARY_DIR}/generators/pythia6.genser-zjetsgenser-rivet.root ${CMAKE_BINARY_DIR}/generators/pythia6-${v}.genser-zjetsgenser-rivet.root "Path=XS,Z_pt,jet_mult,jet_mult_norm,jet1_pt,jet2_pt" "limit=0.05,0.1,0.1,0.04,0.1,0.1"
-  DEPENDS pythia6-${v}.build rivet-tests.genser-prepare_references rivet-tests.genser-buildanalysis
-  TIMEOUT ${timeout}
- )
-endforeach()
-
-foreach(v ${herwig++_native_version})
- LCG_add_test(herwigpp-${v}.genser-ttbar-rivet
-   PRE_COMMAND $ENV{SHELL} -c "cat ${CMAKE_SOURCE_DIR}/generators/herwig++/tests/LHC-ttbar.in | sed '/HepMCFile:Filename/s/herwigpp_ttbar.hepmc/herwigpp-${v}_ttbar.hepmc/g'| sed 's/saverun LHC-ttbar/saverun LHC-ttbar-${v}/g' > ${CMAKE_BINARY_DIR}/generators/LHC-ttbar-${v}.in"
-   TEST_COMMAND ${herwig++-${v}_home}/bin/Herwig++ read ${CMAKE_BINARY_DIR}/generators/LHC-ttbar-${v}.in
-        COMMAND ${herwig++-${v}_home}/bin/Herwig++ run -N${rivettests_stat_size} LHC-ttbar-${v}.run -d1
-        COMMAND ${rivet2_home}/bin/rivet -a MC_GENERIC -a MC_IDENTIFIED -a MC_XS -a MC_TTBAR -H herwigpp-${v}.genser-ttbar-rivet.yoda herwigpp-${v}_ttbar.hepmc
-        COMMAND cat LHC-ttbar-${v}.out
-        COMMAND cat LHC-ttbar-${v}.log
-        BINARY_DIR herwig++/tests
-        SOURCE_DIR herwig++/tests
-   ENVIRONMENT ${library_path}=${Python_home}/lib:${herwig++-${v}_home}/lib/Herwig++:${thepeg-${herwig++_${v}_thepeg}_home}/lib/ThePEG:${HepMC_home}/lib:${lhapdf-${thepeg_${herwig++_${v}_thepeg}_lhapdf}_home}/lib:${fastjet_home}/lib:${GSL_home}/lib:${rivet2_home}/lib:${yoda_home}/lib:${yamlcpp_home}/lib:${ROOT_home}/lib:$ENV{${library_path}}
-              PYTHONPATH=${Python_home}/bin:${agile_home}/lib/python${Python_config_version_twodigit}/site-packages:${yoda_home}/lib/python${Python_config_version_twodigit}/site-packages/:${ROOT_home}/lib:${pyanalysis_home}/lib/python${Python_config_version_twodigit}/site-packages:$ENV{PYTHONPATH}
-              PATH=${agile_home}/bin:${Python_home}/bin:$ENV{PATH}
-   POST_COMMAND ${CMAKE_COMMAND} -DAIDA2ROOT=${AIDA2ROOT} -DPython_cmd=${Python_cmd} -Dyoda_home=${yoda_home} -DINPUT=${CMAKE_BINARY_DIR}/generators/herwigpp-${v}.genser-ttbar-rivet.yoda -P ${CMAKE_SOURCE_DIR}/cmake/scripts/yoda2root.cmake
-        COMMAND ${Python_cmd} ${CMAKE_SOURCE_DIR}/generators/reference/reference.py ${CMAKE_BINARY_DIR}/generators/herwigpp.genser-ttbar-rivet.root ${CMAKE_BINARY_DIR}/generators/herwigpp-${v}.genser-ttbar-rivet.root "Path=XS,jet_HT,jet_mult" "limit=0.05,0.10,0.10"
-   DEPENDS rivet-tests.genser-prepare_references
-   TIMEOUT ${timeout}
- )
-
- LCG_add_test(herwigpp-${v}.genser-zjetsgenser-rivet
-   PRE_COMMAND $ENV{SHELL} -c "test -s ${CMAKE_BINARY_DIR}/generators/herwigpp.genser-zjetsgenser-rivet.root"
-       COMMAND $ENV{SHELL} -c "cat ${CMAKE_SOURCE_DIR}/generators/herwig++/tests/LHC-zjets.in | sed '/HepMCFile:Filename/s/herwigpp_zjets.hepmc/herwigpp-${v}_zjets.hepmc/g' | sed 's/saverun LHC-zjets/saverun LHC-zjets-${v}/g' > ${CMAKE_BINARY_DIR}/generators/LHC-zjets-${v}.in"
-   TEST_COMMAND ${herwig++-${v}_home}/bin/Herwig++ read ${CMAKE_BINARY_DIR}/generators/LHC-zjets-${v}.in
-        COMMAND ${herwig++-${v}_home}/bin/Herwig++ run -N${rivettests_stat_size} LHC-zjets-${v}.run -d1
-        COMMAND ${rivet2_home}/bin/rivet -a MC_XS -a GENSER_MC_ZJETS -a MC_GENERIC -a MC_IDENTIFIED -H herwigpp-${v}.genser-zjetsgenser-rivet.yoda herwigpp-${v}_zjets.hepmc
-        COMMAND cat LHC-zjets-${v}.out
-        COMMAND cat LHC-zjets-${v}.log
-        BINARY_DIR herwig++/tests
-        SOURCE_DIR herwig++/tests
-   ENVIRONMENT ${library_path}=${Python_home}/lib:${herwig++-${v}_home}/lib/Herwig++:${thepeg-${herwig++_${v}_thepeg}_home}/lib/ThePEG:${HepMC_home}/lib:${lhapdf-${thepeg_${herwig++_${v}_thepeg}_lhapdf}_home}/lib:${fastjet_home}/lib:${GSL_home}/lib:${rivet2_home}/lib:${yoda_home}/lib:${yamlcpp_home}/lib:${ROOT_home}/lib:$ENV{${library_path}}
-               PYTHONPATH=${Python_home}/bin:${yoda_home}/lib/python${Python_config_version_twodigit}/site-packages/:${ROOT_home}/lib:${pyanalysis_home}/lib/python${Python_config_version_twodigit}/site-packages:$ENV{PYTHONPATH}
-               PATH=${Python_home}/bin:$ENV{PATH}
-               LHAPATH=${lhapdfsets_home}/../share/lhapdf/PDFsets
-               LHAPDF_DATA_PATH=${lhapdf-${herwig++_${v}_lhapdf}_home}/share/LHAPDF:${CMAKE_INSTALL_PREFIX}/lhapdf6sets/current/share/LHAPDF
-               RIVET_ANALYSIS_PATH=${CMAKE_BINARY_DIR}/generators
-   POST_COMMAND ${CMAKE_COMMAND} -DAIDA2ROOT=${AIDA2ROOT} -DPython_cmd=${Python_cmd} -Dyoda_home=${yoda_home} -DINPUT=${CMAKE_BINARY_DIR}/generators/herwigpp-${v}.genser-zjetsgenser-rivet.yoda -P ${CMAKE_SOURCE_DIR}/cmake/scripts/yoda2root.cmake
-        COMMAND ${CMAKE_SOURCE_DIR}/generators/reference/riv2html.sh ${rivet2_home} herwigpp ${v} zjetsgenser ${LCG_VERSION} ${LCG_platform}
-        COMMAND ${Python_cmd} ${CMAKE_SOURCE_DIR}/generators/reference/reference.py ${CMAKE_BINARY_DIR}/generators/herwigpp.genser-zjetsgenser-rivet.root ${CMAKE_BINARY_DIR}/generators/herwigpp-${v}.genser-zjetsgenser-rivet.root "Path=XS,Z_pt,jet_mult,jet_mult_norm,jet1_pt,jet2_pt" "limit=0.05,0.1,0.1,0.04,0.1,0.1"
-   DEPENDS rivet-tests.genser-prepare_references lhapdf6sets.download rivet-tests.genser-buildanalysis
-   TIMEOUT ${timeout}
- )
-endforeach()
-
-foreach(v ${sherpa_native_version})
- LCG_add_test(sherpa-${v}.genser-zjetsgenser-rivet
-   PRE_COMMAND $ENV{SHELL} -c "cat ${CMAKE_SOURCE_DIR}/generators/sherpa/tests/LHC_ZJets_riv2.dat | sed '/EVENT_OUTPUT/s/sherpa_zjets/sherpa-${v}_zjets/g' > ${CMAKE_BINARY_DIR}/generators/sherpa-${v}.genser-zjets-rivet.dat"
-       COMMAND ${CMAKE_COMMAND} -E make_directory sherpa/zjets/${v}
-   TEST_COMMAND ${CMAKE_COMMAND} -E chdir sherpa/zjets/${v} ${sherpa-${v}_home}/bin/Sherpa -f ${CMAKE_BINARY_DIR}/generators/sherpa-${v}.genser-zjets-rivet.dat -e ${rivettests_stat_size}
-        COMMAND ${rivet2_home}/bin/rivet -a MC_XS -a GENSER_MC_ZJETS -a MC_GENERIC -a MC_IDENTIFIED --histo-file=sherpa-${v}.genser-zjetsgenser-rivet.yoda sherpa/zjets/${v}/sherpa-${v}_zjets.hepmc2g
-   ENVIRONMENT PATH=${Python_home}/bin:${rivet2_home}/bin:{yoda_home}/bin:$ENV{PATH}
-               ${library_path}=${sherpa-${v}_home}/lib/SHERPA-MC:${HepMC_home}/lib:${lhapdf-${sherpa_${v}_lhapdf}_home}/lib:${fastjet_home}/lib:${GSL_home}/lib:${Python_home}/lib:${rivet2_home}/lib:${yoda_home}/lib:${yamlcpp_home}/lib:${ROOT_home}/lib:$ENV{${library_path}}
-               PYTHONPATH=${Python_home}/bin:${yoda_home}/lib/python${Python_config_version_twodigit}/site-packages/:${ROOT_home}/lib:${rivet2_home}/lib/python${Python_config_version_twodigit}/site-packages/:${pyanalysis_home}/lib/python${Python_config_version_twodigit}/site-packages:$ENV{PYTHONPATH}
-               RIVET_ANALYSIS_PATH=${CMAKE_BINARY_DIR}/generators
-               PWD=.
-   POST_COMMAND ${CMAKE_COMMAND} -DAIDA2ROOT=${AIDA2ROOT} -DPython_cmd=${Python_cmd} -Dyoda_home=${yoda_home} -DINPUT=${CMAKE_BINARY_DIR}/generators/sherpa-${v}.genser-zjetsgenser-rivet.yoda -P ${CMAKE_SOURCE_DIR}/cmake/scripts/yoda2root.cmake
-        COMMAND ${CMAKE_SOURCE_DIR}/generators/reference/riv2html.sh ${rivet2_home} sherpa ${v} zjetsgenser ${LCG_VERSION} ${LCG_platform}
-        COMMAND ${Python_cmd} ${CMAKE_SOURCE_DIR}/generators/reference/reference.py ${CMAKE_BINARY_DIR}/generators/sherpa.genser-zjetsgenser-rivet.root ${CMAKE_BINARY_DIR}/generators/sherpa-${v}.genser-zjetsgenser-rivet.root "Path=XS,Z_pt,jet_mult,jet_mult_norm,jet1_pt,jet2_pt" "limit=0.05,0.1,0.1,0.04,0.1,0.1"
-   DEPENDS rivet-tests.genser-prepare_references rivet-tests.genser-buildanalysis
-   TIMEOUT ${timeout}
- )
-endforeach()
-
-#the pre_command for sherpa1 looks like this:
-# PRE_COMMAND $ENV{SHELL} -c "cat ${CMAKE_SOURCE_DIR}/generators/sherpa/tests/LHCV1_ZJets_riv2.dat |
-# sed '/HEPMC2/s/sherpa_zjets/sherpa-${v}_zjets/g' > ${CMAKE_BINARY_DIR}/generators/sherpa-${v}.genser-zjets-rivet.dat"
-
-
-foreach(v ${herwig_native_version})
- string(REGEX MATCH "6.[0-9][0-9][0-9]" v_test_version ${v})
- LCG_add_test(
-   herwig-${v}.genser-zjets-rivet
-   TEST_COMMAND ${CMAKE_COMMAND} -E echo available generators for the given AGILE_GEN_PATH:
-        COMMAND ${agile_home}/bin/agile-runmc --list-gens
-        COMMAND ${CMAKE_COMMAND} -E echo
-        COMMAND ${agile_home}/bin/agile-runmc Herwig:${v_test_version} -o hepmcfile_herwig-${v}_zjetsagile.dat --paramfile ${CMAKE_SOURCE_DIR}/generators/agile_configs/herwig-zjets-8tev.params -n ${rivettests_stat_size}
-        COMMAND ${rivet2_home}/bin/rivet -a MC_GENERIC -a MC_IDENTIFIED -a MC_XS -a MC_ZJETS -H herwig-${v}.genser-zjets-rivet.yoda hepmcfile_herwig-${v}_zjetsagile.dat
-   ENVIRONMENT PATH=${agile_home}/bin:${Python_home}/bin:$ENV{PATH}
-               ${library_path}=${Python_home}/lib:${GSL_home}/lib:${rivet2_home}/lib:${yoda_home}/lib:${HepMC_home}/lib:${fastjet_home}/lib:${yamlcpp_home}/lib:${agile_home}/lib:${HepMC_home}/lib:${ROOT_home}/lib:$ENV{${library_path}}
-               PYTHONPATH=${Python_home}/bin:${agile_home}/lib/python${Python_config_version_twodigit}/site-packages:${yoda_home}/lib/python${Python_config_version_twodigit}/site-packages/:${ROOT_home}/lib:${rivet2_home}/lib/python${Python_config_version_twodigit}/site-packages:${pyanalysis_home}/lib/python${Python_config_version_twodigit}/site-packages:$ENV{PYTHONPATH}
-               AGILE_GEN_PATH=${agile_home}/../../..
-   POST_COMMAND ${CMAKE_COMMAND} -DAIDA2ROOT=${AIDA2ROOT} -DPython_cmd=${Python_cmd} -Dyoda_home=${yoda_home} -DINPUT=${CMAKE_BINARY_DIR}/generators/herwig-${v}.genser-zjets-rivet.yoda -P ${CMAKE_SOURCE_DIR}/cmake/scripts/yoda2root.cmake
-        COMMAND ${Python_cmd} ${CMAKE_SOURCE_DIR}/generators/reference/reference.py ${CMAKE_BINARY_DIR}/generators/herwig.genser-zjets-rivet.root ${CMAKE_BINARY_DIR}/generators/herwig-${v}.genser-zjets-rivet.root "Path=XS,jet_HT" "limit=0.05,0.10"
-   DEPENDS rivet-tests.genser-prepare_references
-   TIMEOUT ${timeout}
- )
-
- LCG_add_test(
-   herwig-${v}.genser-zjetsgenser-rivet
-   TEST_COMMAND herwig/tests/${v}/herwig_genser_outhepmc ${rivettests_stat_size} herwig-${v}.genser-zjets.hepmc.dat
-        COMMAND $ENV{SHELL} -c "cat herwig-${v}.genser-zjets.hepmc.dat | sed 's/U MEV MM/U GEV MM/' > herwig-${v}.genser-zjets.hepmc.datNEW"
-        COMMAND $ENV{SHELL} -c "mv herwig-${v}.genser-zjets.hepmc.datNEW herwig-${v}.genser-zjets.hepmc.dat"
-        COMMAND ${rivet2_home}/bin/rivet -a MC_XS -a GENSER_MC_ZJETS -a MC_GENERIC -a MC_IDENTIFIED --histo-file=herwig-${v}.genser-zjetsgenser-rivet.yoda herwig-${v}.genser-zjets.hepmc.dat
-   ENVIRONMENT PATH=${Python_home}/bin:$ENV{PATH}
-               ${library_path}=${Python_home}/lib:${GSL_home}/lib:${rivet2_home}/lib:${yoda_home}/lib:${HepMC_home}/lib:${fastjet_home}/lib:${herwig-${v}_home}/lib:${yamlcpp_home}/lib:${HepMC_home}/lib:${ROOT_home}/lib:$ENV{${library_path}}
-               PYTHONPATH=${Python_home}/bin:${rivet2_home}/lib/python${Python_config_version_twodigit}/site-packages:${yoda_home}/lib/python${Python_config_version_twodigit}/site-packages/:${ROOT_home}/lib:${pyanalysis_home}/lib/python${Python_config_version_twodigit}/site-packages:$ENV{PYTHONPATH}
-               RIVET_ANALYSIS_PATH=${CMAKE_BINARY_DIR}/generators
-   POST_COMMAND ${CMAKE_COMMAND} -DAIDA2ROOT=${AIDA2ROOT} -DPython_cmd=${Python_cmd} -Dyoda_home=${yoda_home} -DINPUT=${CMAKE_BINARY_DIR}/generators/herwig-${v}.genser-zjetsgenser-rivet.yoda -P ${CMAKE_SOURCE_DIR}/cmake/scripts/yoda2root.cmake
-        COMMAND ${CMAKE_SOURCE_DIR}/generators/reference/riv2html.sh ${rivet2_home} herwig ${v} zjetsgenser ${LCG_VERSION} ${LCG_platform}
-        COMMAND ${Python_cmd} ${CMAKE_SOURCE_DIR}/generators/reference/reference.py ${CMAKE_BINARY_DIR}/generators/herwig.genser-zjetsgenser-rivet.root ${CMAKE_BINARY_DIR}/generators/herwig-${v}.genser-zjetsgenser-rivet.root "Path=XS,Z_pt,jet_mult,jet_mult_norm,jet1_pt,jet2_pt" "limit=0.05,0.1,0.1,0.04,0.1,0.1"
-   DEPENDS herwig-${v}.build rivet-tests.genser-prepare_references rivet-tests.genser-buildanalysis
-   TIMEOUT ${timeout}
- )
-endforeach()
-
-
-foreach(v ${alpgen_native_version})
- LCG_add_test(
-   alpgen-${v}.genser-zjetsgenser-rivet
-   TEST_COMMAND ${CMAKE_COMMAND} -E echo available generators for the given AGILE_GEN_PATH:
-        COMMAND ${agile_home}/bin/agile-runmc --list-gens
-        COMMAND ${CMAKE_COMMAND} -E echo
-        COMMAND ${CMAKE_COMMAND} -E chdir tmpalpgen/examples-${v} $ENV{SHELL} -c "${agile_home}/bin/agile-runmc AlpGenPythia6:${pythia6_test_version}:${v} -o hepmcfile_alpgen_zjets.dat --paramfile ${CMAKE_SOURCE_DIR}/generators/agile_configs/alpgen-zjets.params -n 1000 < inputalpgen3"
-        COMMAND ${rivet2_home}/bin/rivet -a MC_XS -a GENSER_MC_ZJETS -a MC_GENERIC -a MC_IDENTIFIED -H alpgen-${v}.genser-zjetsgenser-rivet.yoda tmpalpgen/examples-${v}/hepmcfile_alpgen_zjets.dat
-   ENVIRONMENT PATH=${agile_home}/bin:${Python_home}/bin:$ENV{PATH}
-               ${library_path}=${Python_home}/lib:${GSL_home}/lib:${rivet2_home}/lib:${yoda_home}/lib:${HepMC_home}/lib:${fastjet_home}/lib:${yamlcpp_home}/lib:${agile_home}/lib:${HepMC_home}/lib:${ROOT_home}/lib:$ENV{${library_path}}
-               PYTHONPATH=${Python_home}/bin:${agile_home}/lib/python${Python_config_version_twodigit}/site-packages:${yoda_home}/lib/python${Python_config_version_twodigit}/site-packages/:${ROOT_home}/lib:${pyanalysis_home}/lib/python${Python_config_version_twodigit}/site-packages:$ENV{PYTHONPATH}
-               AGILE_GEN_PATH=${agile_home}/../../..
-               RIVET_ANALYSIS_PATH=${CMAKE_BINARY_DIR}/generators
-   POST_COMMAND ${CMAKE_COMMAND} -DAIDA2ROOT=${AIDA2ROOT} -DPython_cmd=${Python_cmd} -Dyoda_home=${yoda_home} -DINPUT=${CMAKE_BINARY_DIR}/generators/alpgen-${v}.genser-zjetsgenser-rivet.yoda -P ${CMAKE_SOURCE_DIR}/cmake/scripts/yoda2root.cmake
-        COMMAND ${CMAKE_SOURCE_DIR}/generators/reference/riv2html.sh ${rivet2_home} alpgen ${v} zjetsgenser ${LCG_VERSION} ${LCG_platform}
-        COMMAND ${Python_cmd} ${CMAKE_SOURCE_DIR}/generators/reference/reference.py ${CMAKE_BINARY_DIR}/generators/alpgen.genser-zjetsgenser-rivet.root ${CMAKE_BINARY_DIR}/generators/alpgen-${v}.genser-zjetsgenser-rivet.root "Path=XS,Z_pt,jet_mult,jet_mult_norm,jet1_pt,jet2_pt" "limit=0.05,0.1,0.1,0.04,0.1,0.1"
-   DEPENDS alpgen-${v}.native-examples rivet-tests.genser-buildanalysis rivet-tests.genser-prepare_references
- )
-endforeach()
-
-
-LCG_add_test(rivet-tests.genser-prepare_references
-  PRE_COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/generators/reference/alpgen_riv2_zjetsgenser.yoda ${CMAKE_BINARY_DIR}/generators/alpgen.genser-zjetsgenser-rivet.yoda
-       COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/generators/reference/herwig_riv2_zjets.yoda ${CMAKE_BINARY_DIR}/generators/herwig.genser-zjets-rivet.yoda
-       COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/generators/reference/herwig_riv2_zjetsgenser.yoda  ${CMAKE_BINARY_DIR}/generators/herwig.genser-zjetsgenser-rivet.yoda
-       COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/generators/reference/sherpa_riv2_zjetsgenser.yoda ${CMAKE_BINARY_DIR}/generators/sherpa.genser-zjetsgenser-rivet.yoda
-       COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/generators/reference/herwigpp_riv2_zjetsgenser.yoda ${CMAKE_BINARY_DIR}/generators/herwigpp.genser-zjetsgenser-rivet.yoda
-       COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/generators/reference/herwigpp_riv2_ttbar.yoda ${CMAKE_BINARY_DIR}/generators/herwigpp.genser-ttbar-rivet.yoda
-       COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/generators/reference/pythia6_riv2_zjetsgenser.yoda ${CMAKE_BINARY_DIR}/generators/pythia6.genser-zjetsgenser-rivet.yoda
-       COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/generators/reference/pythia6_riv2_ttbar.yoda ${CMAKE_BINARY_DIR}/generators/pythia6.genser-ttbar-rivet.yoda
-       COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/generators/reference/pythia8_riv2_zjetsgenser.yoda ${CMAKE_BINARY_DIR}/generators/pythia8.genser-zjetsgenser-rivet.yoda
-  TEST_COMMAND ${CMAKE_COMMAND} -DAIDA2ROOT=${AIDA2ROOT} -DPython_cmd=${Python_cmd} -Dyoda_home=${yoda_home} -DINPUT=${CMAKE_BINARY_DIR}/generators/alpgen.genser-zjetsgenser-rivet.yoda -P ${CMAKE_SOURCE_DIR}/cmake/scripts/yoda2root.cmake
-       COMMAND ${CMAKE_COMMAND} -DAIDA2ROOT=${AIDA2ROOT} -DPython_cmd=${Python_cmd} -Dyoda_home=${yoda_home} -DINPUT=${CMAKE_BINARY_DIR}/generators/herwig.genser-zjets-rivet.yoda -P ${CMAKE_SOURCE_DIR}/cmake/scripts/yoda2root.cmake
-       COMMAND ${CMAKE_COMMAND} -DAIDA2ROOT=${AIDA2ROOT} -DPython_cmd=${Python_cmd} -Dyoda_home=${yoda_home} -DINPUT=${CMAKE_BINARY_DIR}/generators/herwig.genser-zjetsgenser-rivet.yoda -P ${CMAKE_SOURCE_DIR}/cmake/scripts/yoda2root.cmake
-       COMMAND ${CMAKE_COMMAND} -DAIDA2ROOT=${AIDA2ROOT} -DPython_cmd=${Python_cmd} -Dyoda_home=${yoda_home} -DINPUT=${CMAKE_BINARY_DIR}/generators/sherpa.genser-zjetsgenser-rivet.yoda -P ${CMAKE_SOURCE_DIR}/cmake/scripts/yoda2root.cmake
-       COMMAND ${CMAKE_COMMAND} -DAIDA2ROOT=${AIDA2ROOT} -DPython_cmd=${Python_cmd} -Dyoda_home=${yoda_home} -DINPUT=${CMAKE_BINARY_DIR}/generators/herwigpp.genser-zjetsgenser-rivet.yoda -P ${CMAKE_SOURCE_DIR}/cmake/scripts/yoda2root.cmake
-       COMMAND ${CMAKE_COMMAND} -DAIDA2ROOT=${AIDA2ROOT} -DPython_cmd=${Python_cmd} -Dyoda_home=${yoda_home} -DINPUT=${CMAKE_BINARY_DIR}/generators/herwigpp.genser-ttbar-rivet.yoda -P ${CMAKE_SOURCE_DIR}/cmake/scripts/yoda2root.cmake
-       COMMAND ${CMAKE_COMMAND} -DAIDA2ROOT=${AIDA2ROOT} -DPython_cmd=${Python_cmd} -Dyoda_home=${yoda_home} -DINPUT=${CMAKE_BINARY_DIR}/generators/pythia6.genser-zjetsgenser-rivet.yoda -P ${CMAKE_SOURCE_DIR}/cmake/scripts/yoda2root.cmake
-       COMMAND ${CMAKE_COMMAND} -DAIDA2ROOT=${AIDA2ROOT} -DPython_cmd=${Python_cmd} -Dyoda_home=${yoda_home} -DINPUT=${CMAKE_BINARY_DIR}/generators/pythia6.genser-ttbar-rivet.yoda -P ${CMAKE_SOURCE_DIR}/cmake/scripts/yoda2root.cmake
-       COMMAND ${CMAKE_COMMAND} -DAIDA2ROOT=${AIDA2ROOT} -DPython_cmd=${Python_cmd} -Dyoda_home=${yoda_home} -DINPUT=${CMAKE_BINARY_DIR}/generators/pythia8.genser-zjetsgenser-rivet.yoda -P ${CMAKE_SOURCE_DIR}/cmake/scripts/yoda2root.cmake
-  POST_COMMAND $ENV{SHELL} -c "test -s ${CMAKE_BINARY_DIR}/generators/pythia8.genser-zjetsgenser-rivet.root"
-  ENVIRONMENT PATH=${Python_home}/bin:${ROOT_home}/bin:$ENV{PATH}
-              ${library_path}=${Python_home}/lib:${rivet2_home}/lib:${yoda_home}/lib:${ROOT_home}/lib:$ENV{${library_path}}
-              PYTHONPATH=${pyanalysis_home}/lib/python${Python_config_version_twodigit}/site-packages:${rivet2_home}/lib/python${Python_config_version_twodigit}/site-packages/:${yoda_home}/lib/python${Python_config_version_twodigit}/site-packages/:${ROOT_home}/lib:$ENV{PYTHONPATH}
-)
-
-LCG_add_test(debug-symbols-test
-  TEST_COMMAND ${CMAKE_SOURCE_DIR}/cmake/scripts/check_debug_symbols.sh ${CMAKE_INSTALL_PREFIX} ${LCG_BUILD_TYPE}
-  LABELS Nightly
-)
-
-LCG_add_test(permissions-test
-  TEST_COMMAND ${CMAKE_SOURCE_DIR}/cmake/scripts/check_permissions.sh ${CMAKE_INSTALL_PREFIX} ${LCG_platform}
-  LABELS Nightly Release Experimental
-)
-
-LCG_add_test(report.build_time
-  TEST_COMMAND ${CMAKE_SOURCE_DIR}/cmake/scripts/report_build_time.sh ${CMAKE_BINARY_DIR}/timestamps
-  LABELS Nightly Release Experimental
-)
-
-LCG_add_test(env-scripts-test
-  TEST_COMMAND ${CMAKE_SOURCE_DIR}/cmake/scripts/check_env_scripts.sh ${CMAKE_INSTALL_PREFIX}
-  LABELS Nightly Release
-)
-
 #---test of the test infrasgtructure---------------------------------------------------------------
 LCG_add_test(test-test PRE_COMMAND /bin/echo pre-comand 1
                            COMMAND /bin/echo pre-comand 2
-- 
GitLab