testsuite/gdb.base: Make skip test use defined behaviour.

The skip test currently relies on the order of evaluation of
arguments which is not defined. Use the comma operator where
order is defined instead.

gdb/testsuite/ChangeLog:

2013-06-18  Will Newton  <will.newton@linaro.org>

	* gdb.base/skip.c: Use comma to evaluate results of foo()
	and bar() before passing to baz().
	* gdb.base/skip.c: baz() now takes one argument instead of
	two.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 2c9e13a263d7ff9cea33cef37675ea24807af6d5..395b86b82b86db36010408364d66a4cf4c7d1ba5 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2013-06-18  Will Newton  <will.newton@linaro.org>
+
+       * gdb.base/skip.c: Use comma to evaluate results of foo()
+       and bar() before passing to baz().
+       * gdb.base/skip.c: baz() now takes one argument instead of
+       two.
+
 2013-06-18  Tom Tromey  <tromey@redhat.com>
 
        * gdb.dwarf2/implptrpiece.exp: New file.

diff --git a/gdb/testsuite/gdb.base/skip.c b/gdb/testsuite/gdb.base/skip.c
index 565ba93fcf8ee4dffe5bef16cfdf67785e71bdc9..1467fe369134090e63d8f0dae4061c115c6f6b55 100644 (file)
--- a/gdb/testsuite/gdb.base/skip.c
+++ b/gdb/testsuite/gdb.base/skip.c
@@ -1,10 +1,11 @@
 int foo();
 int bar();
-int baz(int, int);
+int baz(int);
 
 int main()
 {
-  return baz(foo(), bar());
+  /* Use comma operator to sequence evaluation of bar and foo. */
+  return baz((bar(), foo()));
 }
 
 int foo()

diff --git a/gdb/testsuite/gdb.base/skip1.c b/gdb/testsuite/gdb.base/skip1.c
index 2dab5c3f6189591ec43819ca0088cac7370dc5f8..fe63cd6577951b45bd6f431f3db2806268289fde 100644 (file)
--- a/gdb/testsuite/gdb.base/skip1.c
+++ b/gdb/testsuite/gdb.base/skip1.c
@@ -3,7 +3,7 @@ int bar()
   return 1;
 }
 
-int baz(int a, int b)
+int baz(int a)
 {
-  return a + b;
+  return a + 1;
 }