[PATCH] Testsuite: deal gracefully with lack of pthreads

[PATCH] Testsuite: deal gracefully with lack of pthreads

[Mark Kettenis]

This patch parallels what Daniel has done to the tests in the
gdb.threads subdir.

Elana, Andrew, OK to check this in?

There's probably one issue: We have a ChangeLog in both testsuite and
testsuite/gdb.mi.  Both seem to be in used for MI tests.  Which one is
preferred, and can we think of a way to avoid that both are used?

Mark

Index: ChangeLog
from  Mark Kettenis  <kettenis@gnu.org>

	* gdb669.exp, mi-pthreads.exp, mi1-pthreads.exp: Return instead of
	calling gdb_suppress_entire_file.

Index: gdb669.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/gdb669.exp,v
retrieving revision 1.3
diff -u -p -r1.3 gdb669.exp
--- gdb669.exp 4 Jan 2003 15:37:40 -0000 1.3
+++ gdb669.exp 1 Feb 2003 16:20:29 -0000
@@ -179,10 +179,8 @@ set srcfile "$testfile.c"
 set binfile "$objdir/$subdir/$testfile"
 
 set options [list debug incdir=$objdir]
-if  {[gdb_compile_pthreads "$srcdir/$subdir/$srcfile" $binfile executable $options]
-     != "" } {
-  gdb_suppress_entire_file \
-    "Testcase compile failed, so all tests in this file will automatically fail."
+if {[gdb_compile_pthreads "$srcdir/$subdir/$srcfile" $binfile executable $options] != "" } {
+    return -1
 }
 
 mi_gdb_reinitialize_dir $srcdir/$subdir
Index: mi-pthreads.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi-pthreads.exp,v
retrieving revision 1.5
diff -u -p -r1.5 mi-pthreads.exp
--- mi-pthreads.exp 7 Jan 2003 03:28:14 -0000 1.5
+++ mi-pthreads.exp 1 Feb 2003 16:20:29 -0000
@@ -208,10 +208,8 @@ set srcfile "$testfile.c"
 set binfile "$objdir/$subdir/$testfile"
 
 set options [list debug incdir=$objdir]
-if  {[gdb_compile_pthreads "$srcdir/$subdir/$srcfile" $binfile executable $options]
-     != "" } {
-  gdb_suppress_entire_file \
-    "Testcase compile failed, so all tests in this file will automatically fail."
+if {[gdb_compile_pthreads "$srcdir/$subdir/$srcfile" $binfile executable $options] != "" } {
+    return -1
 }
 
 mi_gdb_reinitialize_dir $srcdir/$subdir
Index: mi1-pthreads.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi1-pthreads.exp,v
retrieving revision 1.3
diff -u -p -r1.3 mi1-pthreads.exp
--- mi1-pthreads.exp 7 Jan 2003 03:28:14 -0000 1.3
+++ mi1-pthreads.exp 1 Feb 2003 16:20:29 -0000
@@ -208,10 +208,8 @@ set srcfile "$testfile.c"
 set binfile "$objdir/$subdir/$testfile"
 
 set options [list debug incdir=$objdir]
-if  {[gdb_compile_pthreads "$srcdir/$subdir/$srcfile" $binfile executable $options]
-     != "" } {
-  gdb_suppress_entire_file \
-    "Testcase compile failed, so all tests in this file will automatically fail."
+if {[gdb_compile_pthreads "$srcdir/$subdir/$srcfile" $binfile executable $options] != "" } {
+    return -1
 }
 
 mi_gdb_reinitialize_dir $srcdir/$subdir

Re: [PATCH] Testsuite: deal gracefully with lack of pthreads

[Andrew Cagney]

> This patch parallels what Daniel has done to the tests in the
> gdb.threads subdir.
> 
> Elana, Andrew, OK to check this in?

yes.

> There's probably one issue: We have a ChangeLog in both testsuite and
> testsuite/gdb.mi.  Both seem to be in used for MI tests.  Which one is
> preferred, and can we think of a way to avoid that both are used?

I don't know....  Probably (I'm not sure I should be saying this) merge 
gdb.mi/ChangeLog into ChangeLog.

File a bug report.

Andrew


> Mark
> 
> Index: ChangeLog
> from  Mark Kettenis  <kettenis@gnu.org>
> 
> 	* gdb669.exp, mi-pthreads.exp, mi1-pthreads.exp: Return instead of
> 	calling gdb_suppress_entire_file.
> 
> Index: gdb669.exp
> ===================================================================
> RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/gdb669.exp,v
> retrieving revision 1.3
> diff -u -p -r1.3 gdb669.exp
> --- gdb669.exp 4 Jan 2003 15:37:40 -0000 1.3
> +++ gdb669.exp 1 Feb 2003 16:20:29 -0000
> @@ -179,10 +179,8 @@ set srcfile "$testfile.c"
>  set binfile "$objdir/$subdir/$testfile"
>  
>  set options [list debug incdir=$objdir]
> -if  {[gdb_compile_pthreads "$srcdir/$subdir/$srcfile" $binfile executable $options]
> -     != "" } {
> -  gdb_suppress_entire_file \
> -    "Testcase compile failed, so all tests in this file will automatically fail."
> +if {[gdb_compile_pthreads "$srcdir/$subdir/$srcfile" $binfile executable $options] != "" } {
> +    return -1
>  }
>  
>  mi_gdb_reinitialize_dir $srcdir/$subdir
> Index: mi-pthreads.exp
> ===================================================================
> RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi-pthreads.exp,v
> retrieving revision 1.5
> diff -u -p -r1.5 mi-pthreads.exp
> --- mi-pthreads.exp 7 Jan 2003 03:28:14 -0000 1.5
> +++ mi-pthreads.exp 1 Feb 2003 16:20:29 -0000
> @@ -208,10 +208,8 @@ set srcfile "$testfile.c"
>  set binfile "$objdir/$subdir/$testfile"
>  
>  set options [list debug incdir=$objdir]
> -if  {[gdb_compile_pthreads "$srcdir/$subdir/$srcfile" $binfile executable $options]
> -     != "" } {
> -  gdb_suppress_entire_file \
> -    "Testcase compile failed, so all tests in this file will automatically fail."
> +if {[gdb_compile_pthreads "$srcdir/$subdir/$srcfile" $binfile executable $options] != "" } {
> +    return -1
>  }
>  
>  mi_gdb_reinitialize_dir $srcdir/$subdir
> Index: mi1-pthreads.exp
> ===================================================================
> RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi1-pthreads.exp,v
> retrieving revision 1.3
> diff -u -p -r1.3 mi1-pthreads.exp
> --- mi1-pthreads.exp 7 Jan 2003 03:28:14 -0000 1.3
> +++ mi1-pthreads.exp 1 Feb 2003 16:20:29 -0000
> @@ -208,10 +208,8 @@ set srcfile "$testfile.c"
>  set binfile "$objdir/$subdir/$testfile"
>  
>  set options [list debug incdir=$objdir]
> -if  {[gdb_compile_pthreads "$srcdir/$subdir/$srcfile" $binfile executable $options]
> -     != "" } {
> -  gdb_suppress_entire_file \
> -    "Testcase compile failed, so all tests in this file will automatically fail."
> +if {[gdb_compile_pthreads "$srcdir/$subdir/$srcfile" $binfile executable $options] != "" } {
> +    return -1
>  }
>  
>  mi_gdb_reinitialize_dir $srcdir/$subdir
> 

Re: [PATCH] Testsuite: deal gracefully with lack of pthreads

[Mark Kettenis]

   Date: Sat, 01 Feb 2003 11:40:22 -0500
   From: Andrew Cagney <ac131313@redhat.com>

   > This patch parallels what Daniel has done to the tests in the
   > gdb.threads subdir.
   > 
   > Elana, Andrew, OK to check this in?

   yes.

Done.

   > There's probably one issue: We have a ChangeLog in both testsuite and
   > testsuite/gdb.mi.  Both seem to be in used for MI tests.  Which one is
   > preferred, and can we think of a way to avoid that both are used?

   I don't know....  Probably (I'm not sure I should be saying this) merge 
   gdb.mi/ChangeLog into ChangeLog.

OK, I added the ChangeLog entries to testsuite/ChangeLog.

Mark

Re: [PATCH] Testsuite: deal gracefully with lack of pthreads

[Michael Elizabeth Chastain]

Mark K asks:
> There's probably one issue: We have a ChangeLog in both testsuite and
> testsuite/gdb.mi.  Both seem to be in used for MI tests.  Which one is
> preferred, and can we think of a way to avoid that both are used?

This issue has come up before.

Since there haven't been any entries to gdb.mi/ChangeLog in 2003,
I propose a bit of a kludge:

  split testsuite/gdb.mi/ChangeLog to gdb.mi/ChangeLog.{1999,2000,2001,2002}
  cvs remove testsuite/gdb.mi/ChangeLog
  use testsuite/ChangeLog now and in the future

My two cents,

Michael C