From c56e7c4390ed81ff5466f3415198e91ee63a0744 Mon Sep 17 00:00:00 2001 From: Joel Brobecker Date: Tue, 5 Jun 2012 13:50:31 +0000 Subject: 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. --- gdb/testsuite/gdb.base/print-file-var-main.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'gdb/testsuite/gdb.base/print-file-var-main.c') diff --git a/gdb/testsuite/gdb.base/print-file-var-main.c b/gdb/testsuite/gdb.base/print-file-var-main.c index b8baf0f..04e45e3 100644 --- a/gdb/testsuite/gdb.base/print-file-var-main.c +++ b/gdb/testsuite/gdb.base/print-file-var-main.c @@ -20,10 +20,15 @@ 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) /* STOP */ return 1; - if (get_version_2 () != 104) + /* The value returned by get_version_2 depends on the target system. */ + if (v2 != 104 || v2 != 203) return 2; + return 0; } -- cgit v1.1