Make ctxobj.exp and print-file-var.exp work on all platforms.

This patch adjusts the testing strategy used in a couple of testcases
where we are trying to print the value of a global variable defined
at multiple locations.  The problem is that the actual value depends
on the platform.  So instead of hard-coding the expected value in
the testcase script, we use local variables (in the inferior) holding
the correct value, and we compare the global variable's value with
the local variable's value.

gdb/testsuite/ChangeLog:

        * gdb.base/ctxobj-f.c (GET_VERSION): Introduce local variable
        and add comment.
        * gdb.base/ctxobj-m.c (main): Rewrite, and add comment.
        * gdb.base/ctxobj.exp: Insert breakpoint in ctxobj-f.c using
        "STOP" marker.  Adjust testing strategy to make it work on
        all targets.

        * gdb.base/print-file-var-main.c (main): Rewrite using local
        variables and adjust get_version_2's return value check.
        Add small comment.
        * gdb.base/print-file-var.exp: Insert breakpoint using "STOP"
        marker.  Adjust testing strategy to make it work on all targets.

1 files changed, 8 insertions, 2 deletions

diff --git a/gdb/testsuite/gdb.base/ctxobj-m.c b/gdb/testsuite/gdb.base/ctxobj-m.c
index 203f838073..97710011ff 100644
--- a/gdb/testsuite/gdb.base/ctxobj-m.c
+++ b/gdb/testsuite/gdb.base/ctxobj-m.c
@@ -20,10 +20,16 @@ extern int get_version_2 (void);
 int
 main (void)
 {
-  if (get_version_1 () != 104)
+  int v1 = get_version_1 ();
+  int v2 = get_version_2 ();
+
+  if (v1 != 104)
     return 1;
 
-  if (get_version_2 () != 203)
+  /* The value returned by get_version_2 depends on the target.
+     On GNU/Linux, for instance, it should return 104.  But on
+     x86-windows, for instance, it will return 203.  */
+  if (v2 != 104 && v2 != 203)
     return 2;
 
   return 0;