From: Mark Wielaard <mjw@redhat.com>
Date: Thu, 3 Sep 2009 12:02:45 +0000 (+0200)
Subject: PR10552 followup, remove -M testcases.
X-Git-Tag: release-1.0~68
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=50a5950bf24aebe1ce65f0f60cc4688df9209f2c;p=systemtap.git

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 b9e7ad1bd..a70a3cce0 100644
--- 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