Patchwork [ob/pushed] Fix gdb.base/print-file-var-main.c value check logic

login
register
mail settings
Submitter Pedro Alves
Date Oct. 9, 2017, 11:44 a.m.
Message ID <1507549441-27135-1-git-send-email-palves@redhat.com>
Download mbox | patch
Permalink /patch/23407/
State New
Headers show

Comments

Pedro Alves - Oct. 9, 2017, 11:44 a.m.
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.
---
 gdb/testsuite/ChangeLog                      | 7 +++++++
 gdb/testsuite/gdb.base/print-file-var-main.c | 6 +++---
 gdb/testsuite/gdb.base/print-file-var.exp    | 2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)

Patch

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index e6c0b7f..bb62d22 100644
--- 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 0a229e5..a19f6f7 100644
--- 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 abbd5b1..223a67d 100644
--- 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