summaryrefslogtreecommitdiffstats
path: root/testsuite/systemtap.base/cache.exp
diff options
context:
space:
mode:
authorJosh Stone <jistone@redhat.com>2009-09-03 14:31:02 -0700
committerJosh Stone <jistone@redhat.com>2009-09-03 14:31:02 -0700
commit06e0b6262393b095a33e9cc6e7ab7bc5d4fe9c95 (patch)
tree8029267099eec7bd898e6532bf6152c8b946f8ba /testsuite/systemtap.base/cache.exp
parentb969d16b2986a491eb37706e09da888d9914a7dd (diff)
parentd0822e28934cd0387c2af4349cf52c52c368c55a (diff)
downloadsystemtap-steved-06e0b6262393b095a33e9cc6e7ab7bc5d4fe9c95.tar.gz
systemtap-steved-06e0b6262393b095a33e9cc6e7ab7bc5d4fe9c95.tar.xz
systemtap-steved-06e0b6262393b095a33e9cc6e7ab7bc5d4fe9c95.zip
Merge branch 'master' of sourceware.org:/git/systemtap
Diffstat (limited to 'testsuite/systemtap.base/cache.exp')
-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