Dropping tests that are timing out. These will be run independently

by developers

Tools/PyJobTransforms/CMakeLists.txt

@@ -30,7 +30,7 @@ foreach( test Echo_tf LogFileScanner Sleep_tf
 endforeach()
 
 if( NOT SIMULATIONBASE AND NOT GENERATIONBASE )
-  foreach( test HISTMerge_tf RAWMerge_tf
+  foreach( test RAWMerge_tf
            trfSubstepIntegration )
      atlas_add_test( ${test}
         SCRIPT test/test_${test}.py
@@ -42,12 +42,6 @@ if( NOT SIMULATIONBASE AND NOT GENERATIONBASE )
 	)	
 endif()
 
-if( NOT SIMULATIONBASE )
-  atlas_add_test( EVNTMerge_tf
-        SCRIPT test/test_EVNTMerge_tf.py
-  )
-endif()
-
 #The following tests currently fail in master and should be revised
 #AODMerge_tf
 #AtlasG4_SimTTBar_tf