From 635035ca64e9c6e6ad8252545446bbf9bc2a9c55 Mon Sep 17 00:00:00 2001 From: David Smith Date: Tue, 1 Sep 2009 15:20:39 -0500 Subject: PR10552: Removed references to the merge ('-M') option. * hash.cxx (find_script_hash): Removed unused merge option. * main.cxx (checkOptions): Removed merge option checks. (main): Removed merge option. * session.h: Ditto. * initscript/README.initscript: Removed reference to '-M' option. * initscript/systemtap.in (stap_getopt): Ditto. * testsuite/parseko/cmdline01.stp: Removed merge option test. * testsuite/parseko/cmdline05.stp: Ditto. --- testsuite/parseko/cmdline01.stp | 6 ------ testsuite/parseko/cmdline05.stp | 5 ----- 2 files changed, 11 deletions(-) delete mode 100755 testsuite/parseko/cmdline01.stp delete mode 100755 testsuite/parseko/cmdline05.stp (limited to 'testsuite/parseko') diff --git a/testsuite/parseko/cmdline01.stp b/testsuite/parseko/cmdline01.stp deleted file mode 100755 index c793c43e..00000000 --- a/testsuite/parseko/cmdline01.stp +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -# -M (merge) option is only valid for bulk mode - -stap -p1 -M -e 'probe begin { exit() }' >/dev/null 2>&1 # otherwise, ERROR: message confuses dejagnu -exit $? diff --git a/testsuite/parseko/cmdline05.stp b/testsuite/parseko/cmdline05.stp deleted file mode 100755 index 0f43d7b4..00000000 --- a/testsuite/parseko/cmdline05.stp +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -# You can't specify '-M', '-b', and '-o' simultaneously. - -stap -p1 -b -M -o stdout -e 'probe begin { exit() }' -- cgit