Re: [patch/rfc/testsuite] Add "compiler_info"

Re: [patch/rfc/testsuite] Add "compiler_info"

[Michael Elizabeth Chastain]

Proofread and tested, no problems.  I'm appending a little snippet
of test code.  I tested with:

  gcc 2.95.3		# reports gnuc-2-95
  gcc 3.2-7-rh		# reports gnuc-3-2
  gcc 3.3.2		# reports gnuc-3-3
  gcc gcc-3_3-branch	# reports gnuc-3-3
  gcc HEAD		# reports gnuc-3-4

I didn't test the non-gcc path.

I prefer "gcc" to "gnuc" but "gnuc" is okay by me.

Recommended for approval.

Michael C

===

2003-11-14  Andrew Cagney  <cagney@redhat.com>

	* lib/gdb.exp (compiler_info): New global.
	(test_compiler_info): New function.
	(get_compiler_info): Set compiler_info.
	* lib/compiler.c, lib/compiler.cc: Add copyright.  When GNUC, set
	"compiler_info".

===

global compiler_info
warning "compiler_info: ${compiler_info}"
if [test_compiler_info gnuc-2-*] {
    warning "test_compiler_info: gnuc-2-*"
}
if [test_compiler_info gnuc-3-*] {
    warning "test_compiler_info: gnuc-3-*"
}
if [test_compiler_info gnuc-3-2] {
    warning "test_compiler_info: gnuc-3-2"
}
if [test_compiler_info gnuc-3-3] {
    warning "test_compiler_info: gnuc-3-3"
}
if [test_compiler_info gnuc-3-4] {
    warning "test_compiler_info: gnuc-3-4"
}

Re: [patch/rfc/testsuite] Add "compiler_info"

[Andrew Cagney]

[-- Attachment #1: Type: text/plain, Size: 589 bytes --]

> Proofread and tested, no problems.  I'm appending a little snippet
> of test code.  I tested with:
> 
>   gcc 2.95.3		# reports gnuc-2-95
>   gcc 3.2-7-rh		# reports gnuc-3-2
>   gcc 3.3.2		# reports gnuc-3-3
>   gcc gcc-3_3-branch	# reports gnuc-3-3
>   gcc HEAD		# reports gnuc-3-4
> 
> I didn't test the non-gcc path.
> 
> I prefer "gcc" to "gnuc" but "gnuc" is okay by me.


Yea, the macro's GNUC but if if you asked anyone the would say GCC. 
Changed and committed.
The now redundant "gcc_compiled" should probably get expunged.

Andrew

> Recommended for approval.
> 
> Michael C


[-- Attachment #2: diffs --]
[-- Type: text/plain, Size: 4641 bytes --]

2003-11-17  Andrew Cagney  <cagney@redhat.com>

	* lib/gdb.exp (compiler_info): New global.
	(test_compiler_info): New function.
	(get_compiler_info): Set compiler_info.
	* lib/compiler.c, lib/compiler.cc: Add copyright.  When GNUC, set
	"compiler_info" to gcc-<major>-<minor>.

Index: lib/compiler.c
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/lib/compiler.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 compiler.c
--- lib/compiler.c	17 Nov 1999 02:30:41 -0000	1.1.1.1
+++ lib/compiler.c	17 Nov 2003 14:59:07 -0000
@@ -1,3 +1,24 @@
+/* This test file is part of GDB, the GNU debugger.
+
+   Copyright 1995, 1997, 1999, 2003 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+ 
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+   Please email any bugs, comments, and/or additions to this file to:
+   bug-gdb@prep.ai.mit.edu  */
+
 /* Often the behavior of any particular test depends upon what compiler was
    used to compile the test.  As each test is compiled, this file is
    preprocessed by the same compiler used to compile that specific test
@@ -24,8 +45,10 @@
 
 #if defined (__GNUC__)
 set gcc_compiled __GNUC__
+set compiler_info [join {gcc __GNUC__ __GNUC_MINOR__ } -]
 #else
 set gcc_compiled 0
+set compiler_info ""
 #endif
 
 return 0
Index: lib/compiler.cc
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/lib/compiler.cc,v
retrieving revision 1.2
diff -u -r1.2 compiler.cc
--- lib/compiler.cc	1 May 2000 05:45:36 -0000	1.2
+++ lib/compiler.cc	17 Nov 2003 14:59:07 -0000
@@ -1,3 +1,24 @@
+/* This test file is part of GDB, the GNU debugger.
+
+   Copyright 1995, 1999, 2003 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+ 
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+   Please email any bugs, comments, and/or additions to this file to:
+   bug-gdb@prep.ai.mit.edu  */
+
 /* Often the behavior of any particular test depends upon what compiler was
    used to compile the test.  As each test is compiled, this file is
    preprocessed by the same compiler used to compile that specific test
@@ -27,8 +48,10 @@
 
 #if defined (__GNUC__)
 set gcc_compiled __GNUC__
+set compiler_info [join {gcc __GNUC__ __GNUC_MINOR__ } -]
 #else
 set gcc_compiled 0
+set compiler_info ""
 #endif
 
 return 0
Index: lib/gdb.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/lib/gdb.exp,v
retrieving revision 1.37
diff -u -r1.37 gdb.exp
--- lib/gdb.exp	1 May 2003 01:09:51 -0000	1.37
+++ lib/gdb.exp	17 Nov 2003 14:59:08 -0000
@@ -1025,6 +1025,9 @@
     return $skip_hp
 }
 
+global compiler_info
+set compiler_info unknown
+
 proc get_compiler_info {binfile args} {
     # Create and source the file that provides information about the compiler
     # used to compile the test case.
@@ -1034,6 +1037,7 @@
     # These two come from compiler.c.
     global signed_keyword_not_used
     global gcc_compiled
+    global compiler_info
 
     if {![istarget "hppa*-*-hpux*"] && ![istarget "mips*-*-irix*"]} {
 	if { [llength $args] > 0 } {
@@ -1104,6 +1108,11 @@
     }
 
     return 0;
+}
+
+proc test_compiler_info { compiler } {
+    global compiler_info
+    return [string match $compiler $compiler_info]
 }
 
 proc get_compiler {args} {

Re: [patch/rfc/testsuite] Add "compiler_info"

[Andrew Cagney]

> Yea, the macro's GNUC but if if you asked anyone the would say GCC. Changed and committed.
> The now redundant "gcc_compiled" should probably get expunged.

PS: Just ignore my accidental commit of structs.{c,exp}, I've reverted it.

Andrew

Re: [patch/rfc/testsuite] Add "compiler_info"

[Michael Elizabeth Chastain]

Andrew Cagney writes:
> The now redundant "gcc_compiled" should probably get expunged.

Good idea!  I filed a PR.

Michael C

Re: [patch/rfc/testsuite] Add "compiler_info"

[Michael Elizabeth Chastain]

I like the copyright notices!

The idea looks sound to me, but I'm a bit too tired to proofread
and test it tonight.

We've already got several places in the test suite
(gdb.base/complex.exp and gdb.base/constvars.exp) that test gcc_compiled
for "2" versus "3" and that machinery is causing no trouble.

Michael C

===

  2003-11-14  Andrew Cagney  <cagney@redhat.com>

	  * lib/gdb.exp (compiler_info): New global.
	  (test_compiler_info): New function.
	  (get_compiler_info): Set compiler_info.
	  * lib/compiler.c, lib/compiler.cc: Add copyright.  When GNUC, set
	  "compiler_info".

[patch/rfc/testsuite] Add "compiler_info"

[Andrew Cagney]

[-- Attachment #1: Type: text/plain, Size: 422 bytes --]

Hello,

This adds a new global (compiler_info) and procedure 
(test_compiler_info) to GDB's test framework.

For GNUC, the variable is set to:

	gnuc-<major>-<minor>
eg
	gnuc-3-3

while for other compilers it is set to "unknown".  test_compiler_info 
can be used (like test_debug_format) for a specific compiler vis:

	[test_compiler_info gnuc-3-*]

for a version 3 GNU C compiler.

MichaelC? (fernando's on hols)

Andrew

[-- Attachment #2: diffs --]
[-- Type: text/plain, Size: 4620 bytes --]

2003-11-14  Andrew Cagney  <cagney@redhat.com>

	* lib/gdb.exp (compiler_info): New global.
	(test_compiler_info): New function.
	(get_compiler_info): Set compiler_info.
	* lib/compiler.c, lib/compiler.cc: Add copyright.  When GNUC, set
	"compiler_info".

Index: lib/compiler.c
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/lib/compiler.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 compiler.c
--- lib/compiler.c	17 Nov 1999 02:30:41 -0000	1.1.1.1
+++ lib/compiler.c	14 Nov 2003 22:44:43 -0000
@@ -1,3 +1,24 @@
+/* This test file is part of GDB, the GNU debugger.
+
+   Copyright 1995, 1997, 1999, 2003 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+ 
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+   Please email any bugs, comments, and/or additions to this file to:
+   bug-gdb@prep.ai.mit.edu  */
+
 /* Often the behavior of any particular test depends upon what compiler was
    used to compile the test.  As each test is compiled, this file is
    preprocessed by the same compiler used to compile that specific test
@@ -24,8 +45,10 @@
 
 #if defined (__GNUC__)
 set gcc_compiled __GNUC__
+set compiler_info [join {gnuc __GNUC__ __GNUC_MINOR__ } -]
 #else
 set gcc_compiled 0
+set compiler_info ""
 #endif
 
 return 0
Index: lib/compiler.cc
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/lib/compiler.cc,v
retrieving revision 1.2
diff -u -r1.2 compiler.cc
--- lib/compiler.cc	1 May 2000 05:45:36 -0000	1.2
+++ lib/compiler.cc	14 Nov 2003 22:44:43 -0000
@@ -1,3 +1,24 @@
+/* This test file is part of GDB, the GNU debugger.
+
+   Copyright 1995, 1999, 2003 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+ 
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+   Please email any bugs, comments, and/or additions to this file to:
+   bug-gdb@prep.ai.mit.edu  */
+
 /* Often the behavior of any particular test depends upon what compiler was
    used to compile the test.  As each test is compiled, this file is
    preprocessed by the same compiler used to compile that specific test
@@ -27,8 +48,10 @@
 
 #if defined (__GNUC__)
 set gcc_compiled __GNUC__
+set compiler_info [join {gnuc __GNUC__ __GNUC_MINOR__ } -]
 #else
 set gcc_compiled 0
+set compiler_info ""
 #endif
 
 return 0
Index: lib/gdb.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/lib/gdb.exp,v
retrieving revision 1.37
diff -u -r1.37 gdb.exp
--- lib/gdb.exp	1 May 2003 01:09:51 -0000	1.37
+++ lib/gdb.exp	14 Nov 2003 22:44:44 -0000
@@ -1025,6 +1025,9 @@
     return $skip_hp
 }
 
+global compiler_info
+set compiler_info unknown
+
 proc get_compiler_info {binfile args} {
     # Create and source the file that provides information about the compiler
     # used to compile the test case.
@@ -1034,6 +1037,7 @@
     # These two come from compiler.c.
     global signed_keyword_not_used
     global gcc_compiled
+    global compiler_info
 
     if {![istarget "hppa*-*-hpux*"] && ![istarget "mips*-*-irix*"]} {
 	if { [llength $args] > 0 } {
@@ -1104,6 +1108,11 @@
     }
 
     return 0;
+}
+
+proc test_compiler_info { compiler } {
+    global compiler_info
+    return [string match $compiler $compiler_info]
 }
 
 proc get_compiler {args} {