patch ../102425547.patch

4 files changed, 49 insertions, 15 deletions

diff --git a/README.google b/README.google
index 05adf7a..5a29e0d 100644
--- a/README.google
+++ b/README.google
@@ -45,3 +45,18 @@ they are an ongoing maintenance burden.
 +
 +	* remote.c (readchar): Don't lengthen timeout value of 0,
 +	return immediately means return immediately.
+--- README.google	2015-09-05 15:13:05.000000000 -0700
++++ README.google	2015-09-05 15:16:13.000000000 -0700
++
++2015-09-05  Doug Evans  <dje@google.com>
++
++	Temporary hack to make these tests pass with Fission.
++	To be replaced with something that can be checked in upstream
++	when support for .dwp files is completed.
++	* gdb.python/py-prettyprint.exp: Do all C testing before any C++
++	testing.
++
++	* testsuite/gdb.mi/mi-var-invalidate.exp: Reorder compilations so
++	that var-cmd.dwo isn't clobbered.
++
++	* testsuite/boards/fission.exp: Add blaze support.
diff --git a/gdb/testsuite/boards/fission.exp b/gdb/testsuite/boards/fission.exp
index af9c003..b8cc2ec 100644
--- a/gdb/testsuite/boards/fission.exp
+++ b/gdb/testsuite/boards/fission.exp
@@ -35,3 +35,10 @@ set_board_info debug_flags "-gdwarf-4 -gsplit-dwarf -ggnu-pubnames -fdebug-types
 # Double blech: set_board_info only sets the value if not already set.
 unset_board_info isremote
 set_board_info isremote 0
+
+# Enable fission in blaze builds.
+if [info exists CROSSTOOL_ARGS] {
+    lappend CROSSTOOL_ARGS " --fission=dbg"
+} else {
+    set CROSSTOOL_ARGS "--fission=dbg"
+}
diff --git a/gdb/testsuite/gdb.mi/mi-var-invalidate.exp b/gdb/testsuite/gdb.mi/mi-var-invalidate.exp
index 0df1fd3..984d1bc 100644
--- a/gdb/testsuite/gdb.mi/mi-var-invalidate.exp
+++ b/gdb/testsuite/gdb.mi/mi-var-invalidate.exp
@@ -34,20 +34,6 @@ if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {deb
     untested mi-var-invalidate.exp
     return -1
 }
-# Just change the output binary.
-set binfile_bis [standard_output_file mi-var-invalidate_bis]
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile_bis}" executable {debug}] != "" } {
-    untested mi-var-invalidate.exp
-    return -1
-}
-
-set testfile2 "basics"
-set srcfile2 ${testfile2}.c
-set binfile2 [standard_output_file ${testfile2}]
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile2}" "${binfile2}" executable {debug}] != "" } {
-    untested mi-var-invalidate.exp
-    return -1
-}
 
 mi_delete_breakpoints
 mi_gdb_reinitialize_dir $srcdir/$subdir
@@ -68,6 +54,15 @@ mi_create_floating_varobj float_simple array "create floating variable"
 # Reload the same binary.
 # Global variable should remain, local should be invalidated.
 #
+
+# GOOGLE LOCAL: Don't clobber var-cmd.dwo.
+# Just change the output binary.
+set binfile_bis [standard_output_file mi-var-invalidate_bis]
+if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile_bis}" executable {debug}] != "" } {
+    untested mi-var-invalidate.exp
+    return -1
+}
+
 mi_delete_breakpoints
 mi_gdb_load ${binfile_bis}
 mi_runto main
@@ -101,6 +96,16 @@ mi_gdb_test "-var-info-type global_simple" \
 # Load an other binary.
 # All variables must be invalidated.
 #
+
+# GOOGLE LOCAL: Don't clobber var-cmd.dwo.
+set testfile2 "basics"
+set srcfile2 ${testfile2}.c
+set binfile2 [standard_output_file ${testfile2}]
+if  { [gdb_compile "${srcdir}/${subdir}/${srcfile2}" "${binfile2}" executable {debug}] != "" } {
+    untested mi-var-invalidate.exp
+    return -1
+}
+
 mi_delete_breakpoints
 mi_gdb_load ${binfile2}
 # Check local variable are "invalid"
diff --git a/gdb/testsuite/gdb.python/py-prettyprint.exp b/gdb/testsuite/gdb.python/py-prettyprint.exp
index bbcee56..6f8f1181 100644
--- a/gdb/testsuite/gdb.python/py-prettyprint.exp
+++ b/gdb/testsuite/gdb.python/py-prettyprint.exp
@@ -115,7 +115,6 @@ proc run_lang_tests {exefile lang} {
 }
 
 run_lang_tests "${binfile}" "c"
-run_lang_tests "${binfile}-cxx" "c++"
 
 # Run various other tests.
 
@@ -157,3 +156,11 @@ gdb_test_no_output "python enable_lookup_function ()"
 
 gdb_test "print ss" " = a=< a=<1> b=<$hex>> b=< a=<2> b=<$hex>>" \
     "print ss enabled #2"
+
+# Now that we're done with C testing, test C++.
+# Note: This build must be done after all C testing because the .o file
+# used by the C and C++ versions are the same, and thus if we're testing
+# Fission then the .dwo files will be the same, and building the c++ file
+# will clobber the C .dwo file.
+
+run_lang_tests "${binfile}-cxx" "c++"