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.

3 files changed, 12 insertions, 4 deletions

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 2c9e13a..395b86b 100644
--- 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 565ba93..1467fe3 100644
--- 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 2dab5c3..fe63cd6 100644
--- 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;
 }