* gdb.gdb/selftest.exp: Remove support for gpl v1 and v2 gdb's.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index ca54ab73394fdf232a7519db16f6eb2f757211a2..e324c569a74f4cc4451018d042d7b6e07ff668d6 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2010-06-21  Doug Evans  <dje@google.com>
+
+       * gdb.gdb/selftest.exp: Remove support for gpl v1 and v2 gdb's.
+
 2010-06-19  Ulrich Weigand  <Ulrich.Weigand@de.ibm.com>
 
        * gdb.arch/spu-ls.exp: New file.

diff --git a/gdb/testsuite/gdb.gdb/selftest.exp b/gdb/testsuite/gdb.gdb/selftest.exp
index e2b5b1c9af56fa7d379b18089973cf828fb14e9e..d07d1475912d3098029c3313d1b99e353bb28eee 100644 (file)
--- a/gdb/testsuite/gdb.gdb/selftest.exp
+++ b/gdb/testsuite/gdb.gdb/selftest.exp
@@ -398,12 +398,6 @@ proc test_with_self { executable } {
        -re "GNU gdb \[0-9\.\]*.*Copyright \\(C\\) \[0-9\]* Free Software Foundation, Inc.*License GPLv3\\+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>.*This is free software: you are free to change and redistribute it.*There is NO WARRANTY, to the extent permitted by law.  Type \"show copying\".*and \"show warranty\" for details.*This GDB was configured as .*$gdb_prompt $" {
            pass "xgdb is at prompt"
        }
-       -re "GNU gdb \[0-9\.\]*.*Copyright \\(C\\) \[0-9\]* Free Software Foundation, Inc.*GDB is free software, covered by the GNU General Public License, and you are.*welcome to change it and/or distribute copies of it under certain conditions.*Type \"show copying\" to see the conditions.*There is absolutely no warranty for GDB.  Type \"show warranty\" for details.*This GDB was configured as .*$gdb_prompt $" {
-           pass "xgdb is at prompt (obsolescent gdb 2)"
-       }
-       -re "GDB is free software and you are welcome to distribute copies of it.* under certain conditions; type \"show copying\" to see the conditions..*There is absolutely no warranty for GDB; type \"show warranty\" for details..*GDB.*Copyright \[0-9\]+ Free Software Foundation, Inc..*$gdb_prompt $" {
-           pass "xgdb is at prompt (obsolescent gdb 1)"
-       }
     }
     
     # set xgdb prompt so we can tell which is which