PR10552 followup, remove -M testcases.

* testsuite/systemtap.base/cache.exp: Remove MERGE1 and MERGE2 (-M) tests.

diff --git a/testsuite/systemtap.base/cache.exp b/testsuite/systemtap.base/cache.exp
index b9e7ad1bd324ebfb5a2a71df9e9ce08160fac834..a70a3cce0bd84b508bd27b61750e1bb44ebbd787 100644 (file)
--- a/testsuite/systemtap.base/cache.exp
+++ b/testsuite/systemtap.base/cache.exp
@@ -93,11 +93,6 @@ cache_compile OPTION2 [F_CACHED_COMPILE] $basic_script1 -DFOO=1
 cache_compile BULK1 [F_UNCACHED_COMPILE] $basic_script1 -b
 cache_compile BULK2 [F_CACHED_COMPILE] $basic_script1 -b
 
-# Using '-M' (don't merge per-cpu files for bulk mode) should change
-# the hash 
-cache_compile MERGE1 [F_UNCACHED_COMPILE] $basic_script1 -b -M
-cache_compile MERGE2 [F_CACHED_COMPILE] $basic_script1 -b -M
-
 # Using '-t' (benchmark timing) should change the hash
 cache_compile TIMING1 [F_UNCACHED_COMPILE] $basic_script1 -t
 cache_compile TIMING2 [F_CACHED_COMPILE] $basic_script1 -t