summaryrefslogtreecommitdiffstats
path: root/testsuite
diff options
context:
space:
mode:
authorDave Brolley <brolley@redhat.com>2010-01-15 10:57:08 -0500
committerDave Brolley <brolley@redhat.com>2010-01-15 10:57:08 -0500
commitceeefadd6874e3d315669a87ec0d05a0ce1f7094 (patch)
treefad469e3f31212afee4d1fb6aa6833b48e1724b7 /testsuite
parent3f78f0208e1bfe8061d1898418882b5e2756f8a2 (diff)
parent86f99ad8206574dc6400d48563db58341cb50f52 (diff)
downloadsystemtap-steved-ceeefadd6874e3d315669a87ec0d05a0ce1f7094.tar.gz
systemtap-steved-ceeefadd6874e3d315669a87ec0d05a0ce1f7094.tar.xz
systemtap-steved-ceeefadd6874e3d315669a87ec0d05a0ce1f7094.zip
Merge branch 'master' of ssh://sources.redhat.com/git/systemtap
Conflicts: stap-client
Diffstat (limited to 'testsuite')
-rw-r--r--testsuite/systemtap.server/client_args.exp4
1 files changed, 2 insertions, 2 deletions
diff --git a/testsuite/systemtap.server/client_args.exp b/testsuite/systemtap.server/client_args.exp
index 348f8cea..f41b91cb 100644
--- a/testsuite/systemtap.server/client_args.exp
+++ b/testsuite/systemtap.server/client_args.exp
@@ -1,11 +1,11 @@
-set test "Valid Server Client Arguments"
+set test "Invalid Server Client Arguments"
# Test that stap on the server side will correctly accept/reject certain
# arguments in unprivileged mode.
set test_file $srcdir/systemtap.server/test.stp
# Test invalid combinations.
-set error_regexp ".*You can't specify (-\[aBDImRr\], )*-\[aBDImRr\] when --unprivileged is specified.*"
+set error_regexp ".*You can't specify .* when --unprivileged is specified.*"
set invalid_options [list \
"--unprivileged --client-options -a i386" \