Merge GDB 7.5.1

gdb/testsuite/gdb.base/enumval.exp

Index: gdb/testsuite/gdb.base/enumval.exp
diff --git a/gdb/testsuite/gdb.base/source-test.gdb b/gdb/testsuite/gdb.base/enumval.exp
similarity index 66%
copy from gdb/testsuite/gdb.base/source-test.gdb
copy to gdb/testsuite/gdb.base/enumval.exp
index d51ca8b9bf928b0ff289caea5f75bbb8e2546bc6..fa41096a3bd488d572784631de9006d3947b94ff 100644
--- a/gdb/testsuite/gdb.base/source-test.gdb
+++ b/gdb/testsuite/gdb.base/enumval.exp
@@ -1,6 +1,6 @@
 # This testcase is part of GDB, the GNU debugger.
 
-# Copyright 2010-2012 Free Software Foundation, Inc.
+# Copyright 2012 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -15,6 +15,17 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# Test GDB's "source" command options.
+set testfile "enumval"
+set srcfile ${testfile}.c
+set binfile ${objdir}/${subdir}/${testfile}
 
-echo test source options\n
+if { [prepare_for_testing enumval.exp "enumval" "" {debug}] } {
+    return -1
+}
+
+# Check the real contents.
+gdb_test "print e" "= J"
+gdb_test "print f" "= K"
+
+gdb_test "print J" "= J"
+gdb_test "print K" "= K"