From: Keith Seitz <keiths@redhat.com>
Date: Thu, 13 Aug 2015 18:56:50 +0000 (-0700)
Subject: Move strace -m/explicit location test to strace.exp
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ad89c2aa677c28c76ffd5a35e2b36eece4d82597;p=binutils-gdb.git

Move strace -m/explicit location test to strace.exp

One of the build slaves shows this error running explicit.exp:

(gdb) strace -m gdbfoobarbaz
Remote failure reply: E.In-process agent library not loaded in process.
Fast and static tracepoints unavailable.
(gdb) FAIL: gdb.linespec/explicit.exp: strace -m gdbfoobarbaz

There are two big problems with this test:
1) The expected output is actually not what the test is meant to test for.
2) This test should really only run where it is supported.

This is most easily fixed by moving the test to gdb.trace/strace.exp.

gdb/testsuite/ChangeLog

	* gdb.linespec/explicit.exp: Move strace test from here ...
	* gdb.trace/strace.exp: ... to here.
---

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 37ed04303cf..9a7cf8814eb 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2015-08-17  Keith Seitz  <keiths@redhat.com>
+
+	* gdb.linespec/explicit.exp: Move strace test from here ...
+	* gdb.trace/strace.exp: ... to here.
+
 2015-08-15  Patrick Palka  <patrick@parcs.ath.cx>
 
 	* gdb.base/kill-detach-inferiors-cmd.exp: New test file.
diff --git a/gdb/testsuite/gdb.linespec/explicit.exp b/gdb/testsuite/gdb.linespec/explicit.exp
index 344f1b008d4..a0851cdc5d2 100644
--- a/gdb/testsuite/gdb.linespec/explicit.exp
+++ b/gdb/testsuite/gdb.linespec/explicit.exp
@@ -86,10 +86,6 @@ namespace eval $testfile {
     add linespecs "-function myfunction -label top -line 3" $location(top)
     add linespecs "-line 3" $location(normal)
 
-    # Test that static tracepoints on marker ID are not interpreted
-    # as an erroneous explicit option.
-    gdb_test "strace -m gdbfoobarbaz" "You can't do that.*"
-
     # Fire up gdb.
     if {![runto_main]} {
 	return -1
diff --git a/gdb/testsuite/gdb.trace/strace.exp b/gdb/testsuite/gdb.trace/strace.exp
index 8610fdf5545..e0a40824e7a 100644
--- a/gdb/testsuite/gdb.trace/strace.exp
+++ b/gdb/testsuite/gdb.trace/strace.exp
@@ -390,6 +390,11 @@ if { ![gdb_target_supports_trace] } then {
     return -1
 }
 
+# Double-check that marker ID ("-m") is not mistaken for an explicit location
+# flag.
+gdb_test "strace -m gdbfoobarbaz" \
+    "No known static tracepoint marker named gdbfoobarbaz"
+
 strace_probe_marker
 
 strace_trace_on_same_addr "trace"