summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Wielaard <mjw@redhat.com>2009-09-03 14:02:45 +0200
committerMark Wielaard <mjw@redhat.com>2009-09-03 14:02:45 +0200
commit50a5950bf24aebe1ce65f0f60cc4688df9209f2c (patch)
tree07a99555b9b8cb3f9a85a18122ef34b6ddeb6dc5
parent50b6acf7d3f01248697bb2d380da25fb99d04026 (diff)
downloadsystemtap-steved-50a5950bf24aebe1ce65f0f60cc4688df9209f2c.tar.gz
systemtap-steved-50a5950bf24aebe1ce65f0f60cc4688df9209f2c.tar.xz
systemtap-steved-50a5950bf24aebe1ce65f0f60cc4688df9209f2c.zip
PR10552 followup, remove -M testcases.
* testsuite/systemtap.base/cache.exp: Remove MERGE1 and MERGE2 (-M) tests.
-rw-r--r--testsuite/systemtap.base/cache.exp5
1 files changed, 0 insertions, 5 deletions
diff --git a/testsuite/systemtap.base/cache.exp b/testsuite/systemtap.base/cache.exp
index b9e7ad1b..a70a3cce 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