Fix gdb.base/print-file-var-main.c value check logic

Fix a typo introduced in commit c56e7c4390ed ("Make ctxobj.exp and
print-file-var.exp work on all platforms.").

This doesn't really affect the outcome of the testcase.  I only
noticed the typo because I stepped through the program manually.

To avoid such problems if the test is extended, this moves the STOP
marker until after the program self-validates the values.  With the
typo in place, this alone would have resulted in a test FAIL.  I.e.,
it'd have caught the typo.

gdb/testsuite/ChangeLog:
2017-10-09  Pedro Alves  <palves@redhat.com>

	* gdb.base/print-file-var-main.c: Fix get_version_2 value check
	logic.  Move STOP marker after the value checks.
	* gdb.base/print-file-var.exp (continue to STOP marker): Tighten
	regexp.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index e6c0b7f53972bd8c7cc48a54b820c77d4c7c13f0..bb62d222ba57d107968704fc74ea0eec529d327e 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2017-10-09  Pedro Alves  <palves@redhat.com>
+
+       * gdb.base/print-file-var-main.c: Fix get_version_2 value check
+       logic.  Move STOP marker after the value checks.
+       * gdb.base/print-file-var.exp (continue to STOP marker): Tighten
+       regexp.
+
 2017-10-06  Sandra Loosemore  <sandra@codesourcery.com>
 
        * gdb.mi/mi-threads-interrupt.exp: Skip test if nointerrupts.

diff --git a/gdb/testsuite/gdb.base/print-file-var-main.c b/gdb/testsuite/gdb.base/print-file-var-main.c
index 0a229e5235534b1a241094c09c1be3db94a033f2..a19f6f7559ed149842381cae0c221456c69c6830 100644 (file)
--- a/gdb/testsuite/gdb.base/print-file-var-main.c
+++ b/gdb/testsuite/gdb.base/print-file-var-main.c
@@ -23,12 +23,12 @@ main (void)
   int v1 = get_version_1 ();
   int v2 = get_version_2 ();
 
-  if (v1 != 104)  /* STOP */
+  if (v1 != 104)
     return 1;
   /* The value returned by get_version_2 depends on the target system.  */
-  if (v2 != 104 || v2 != 203)
+  if (v2 != 104 && v2 != 203)
     return 2;
 
-  return 0;
+  return 0; /* STOP */
 }
 

diff --git a/gdb/testsuite/gdb.base/print-file-var.exp b/gdb/testsuite/gdb.base/print-file-var.exp
index abbd5b1552e7febc5c11dc7e4dde9e68ebc18e28..223a67dbfaa45e4d963793297071c798697187e7 100644 (file)
--- a/gdb/testsuite/gdb.base/print-file-var.exp
+++ b/gdb/testsuite/gdb.base/print-file-var.exp
@@ -79,7 +79,7 @@ gdb_test "break $executable.c:$bp_location" \
          "breapoint past v1 & v2 initialization"
 
 gdb_test "continue" \
-         "Breakpoint \[0-9\]+, main \\(\\) at.*" \
+         "Breakpoint \[0-9\]+, main \\(\\) at.*STOP.*" \
          "continue to STOP marker"
 
 # Now check the value of this_version_id in both print-file-var-lib1.c