* [PATCH 2/2] gdb/testsuite: Merge cvexpr.exp and ctf-cvexpr.exp
2019-10-08 9:39 [PATCH 0/2] CTF Testing Changes Andrew Burgess
@ 2019-10-08 9:39 ` Andrew Burgess
2019-10-08 9:39 ` [PATCH 1/2] gdb/testsuite: Introduce compiler_supports_ctf_debug guard function Andrew Burgess
2019-10-08 21:04 ` [PATCH 0/2] CTF Testing Changes Weimin Pan
2 siblings, 0 replies; 4+ messages in thread
From: Andrew Burgess @ 2019-10-08 9:39 UTC (permalink / raw)
To: gdb-patches; +Cc: Weimin Pan, Simon Marchi, Andrew Burgess
The recently added gdb.base/ctf-cvexpr.exp is just a copy of
gdb.base/cvexpr.exp but compiled with different options. This patch
merges these two tests together into a single test script.
gdb/testsuite/ChangeLog:
* gdb.base/ctf-cvexpr.exp: Delete.
* gdb.base/cvexpr.exp: Rewrite to compile as both dwarf and ctf.
---
gdb/testsuite/ChangeLog | 5 +
gdb/testsuite/gdb.base/ctf-cvexpr.exp | 495 ----------------------------------
gdb/testsuite/gdb.base/cvexpr.exp | 466 +++++++++++++++++---------------
3 files changed, 248 insertions(+), 718 deletions(-)
delete mode 100644 gdb/testsuite/gdb.base/ctf-cvexpr.exp
diff --git a/gdb/testsuite/gdb.base/ctf-cvexpr.exp b/gdb/testsuite/gdb.base/ctf-cvexpr.exp
deleted file mode 100644
index 67ceb21f520..00000000000
--- a/gdb/testsuite/gdb.base/ctf-cvexpr.exp
+++ /dev/null
@@ -1,495 +0,0 @@
-# Copyright (C) 2019 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 3 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, see <http://www.gnu.org/licenses/>.
-
-# This file is a subset of cvexpr.exp written by
-# Michael Snyder, Red Hat, Inc., 9/20/2001
-
-# This file is part of the gdb testsuite
-# Tests for type expressions using const and volatile keywords.
-
-#
-# test running programs
-#
-# -gt generates full-fledged CTF.
-
-standard_testfile cvexpr.c
-set opts "additional_flags=-gt"
-
-if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
- untested "failed to compile"
- return -1
-}
-
-clean_restart ${binfile}
-
-gdb_test_no_output "set print sevenbit-strings"
-gdb_test_no_output "set print address off"
-gdb_test_no_output "set width 0"
-
-set ws "\[ \t\]*"
-
-#
-# Test casting a scalar to const
-#
-
-gdb_test "whatis (const char) v_char" \
- "type = const char" \
- "(const char)"
-gdb_test "whatis (const signed char) v_signed_char" \
- "type = const signed char" \
- "(const signed char)"
-gdb_test "whatis (const unsigned char) v_unsigned_char" \
- "type = const (unsigned char|char)" \
- "(const unsigned char)"
-gdb_test "whatis (const short) v_short" \
- "type = const (short|short int)" \
- "(const short)"
-gdb_test "whatis (const signed short) v_signed_short" \
- "type = const (short|short int|signed short|signed short int)" \
- "(const signed short)"
-gdb_test "whatis (const unsigned short) v_unsigned_short" \
- "type = const (unsigned short|short unsigned int)" \
- "(const unsigned short)"
-gdb_test "whatis (const int) v_int" \
- "type = const int" \
- "(const int)"
-gdb_test "whatis (const signed int) v_signed_int" \
- "type = const (signed int|int)" \
- "(const signed int)"
-gdb_test "whatis (const unsigned int) v_unsigned_int" \
- "type = const unsigned int" \
- "(const unsigned int)"
-gdb_test "whatis (const long) v_long" \
- "type = const (long|long int)" \
- "(const long)"
-gdb_test "whatis (const signed long) v_signed_long" \
- "type = const (signed |)long( int|)" \
- "(const signed long)"
-gdb_test "whatis (const unsigned long) v_unsigned_long" \
- "type = const (unsigned long|long unsigned int)" \
- "(const unsigned long)"
-gdb_test "whatis (const long long) v_long_long" \
- "type = const long long( int|)" \
- "(const long long)"
-gdb_test "whatis (const signed long long) v_signed_long_long" \
- "type = const (signed |)long long( int|)" \
- "(const signed long long)"
-gdb_test "whatis (const unsigned long long) v_unsigned_long_long" \
- "type = const (unsigned long long|long long unsigned int)" \
- "(const unsigned long long)"
-gdb_test "whatis (const float) v_float" \
- "type = const float" \
- "(const float)"
-gdb_test "whatis (const double) v_double" \
- "type = const double" \
- "(const double)"
-
-#
-# Test casting a scalar to volatile
-#
-
-gdb_test "whatis (volatile char) v_char" \
- "type = volatile char" \
- "(volatile char)"
-gdb_test "whatis (volatile signed char) v_signed_char" \
- "type = volatile signed char" \
- "(volatile signed char)"
-gdb_test "whatis (volatile unsigned char) v_unsigned_char" \
- "type = volatile (unsigned char|char)" \
- "(volatile unsigned char)"
-gdb_test "whatis (volatile short) v_short" \
- "type = volatile (short|short int)" \
- "(volatile short)"
-gdb_test "whatis (volatile signed short) v_signed_short" \
- "type = volatile (short|short int|signed short|signed short int)" \
- "(volatile signed short)"
-gdb_test "whatis (volatile unsigned short) v_unsigned_short" \
- "type = volatile (unsigned short|short unsigned int)" \
- "(volatile unsigned short)"
-gdb_test "whatis (volatile int) v_int" \
- "type = volatile int" \
- "(volatile int)"
-gdb_test "whatis (volatile signed int) v_signed_int" \
- "type = volatile (signed int|int)" \
- "(volatile signed int)"
-gdb_test "whatis (volatile unsigned int) v_unsigned_int" \
- "type = volatile unsigned int" \
- "(volatile unsigned int)"
-gdb_test "whatis (volatile long) v_long" \
- "type = volatile (long|long int)" \
- "(volatile long)"
-gdb_test "whatis (volatile signed long) v_signed_long" \
- "type = volatile (signed |)long( int|)" \
- "(volatile signed long)"
-gdb_test "whatis (volatile unsigned long) v_unsigned_long" \
- "type = volatile (unsigned long|long unsigned int)" \
- "(volatile unsigned long)"
-gdb_test "whatis (volatile long long) v_long_long" \
- "type = volatile long long( int|)" \
- "(volatile long long)"
-gdb_test "whatis (volatile signed long long) v_signed_long_long" \
- "type = volatile (signed |)long long( int|)" \
- "(volatile signed long long)"
-gdb_test "whatis (volatile unsigned long long) v_unsigned_long_long" \
- "type = volatile (unsigned long long|long long unsigned int)" \
- "(volatile unsigned long long)"
-gdb_test "whatis (volatile float) v_float" \
- "type = volatile float" \
- "(volatile float)"
-gdb_test "whatis (volatile double) v_double" \
- "type = volatile double" \
- "(volatile double)"
-
-#
-# Combine const and volatile
-#
-
-gdb_test "whatis (const volatile int) v_int" \
- "type = const volatile int" \
- "(const volatile int)"
-gdb_test "whatis (volatile const int) v_int" \
- "type = const volatile int" \
- "(volatile const int)"
-gdb_test "whatis (const int volatile) v_int" \
- "type = const volatile int" \
- "(const int volatile)"
-gdb_test "whatis (volatile int const) v_int" \
- "type = const volatile int" \
- "(volatile int const)"
-gdb_test "whatis (int const volatile) v_int" \
- "type = const volatile int" \
- "(int const volatile)"
-gdb_test "whatis (int volatile const) v_int" \
- "type = const volatile int" \
- "(int volatile const)"
-
-gdb_test "whatis (const volatile int *) v_int_pointer" \
- "type = const volatile int${ws}\\*" \
- "(const volatile int *)"
-gdb_test "whatis (volatile const int *) v_int_pointer" \
- "type = const volatile int${ws}\\*" \
- "(volatile const int *)"
-gdb_test "whatis (const int volatile *) v_int_pointer" \
- "type = const volatile int${ws}\\*" \
- "(const int volatile)"
-gdb_test "whatis (volatile int const *) v_int_pointer" \
- "type = const volatile int${ws}\\*" \
- "(volatile int const *)"
-gdb_test "whatis (int const volatile *) v_int_pointer" \
- "type = const volatile int${ws}\\*" \
- "(int const volatile *)"
-gdb_test "whatis (int volatile const *) v_int_pointer" \
- "type = const volatile int${ws}\\*" \
- "(int volatile const *)"
-gdb_test "whatis (int * const volatile) v_int_pointer" \
- "type = int${ws}\\*${ws}const volatile" \
- "(int * const volatile)"
-gdb_test "whatis (int * volatile const) v_int_pointer" \
- "type = int${ws}\\*${ws}const volatile" \
- "(int * volatile const)"
-
-
-#
-# Put 'signed' and 'unsigned' before const/volatile (FIXME)
-#
-
-#gdb_test "whatis (signed const char) v_signed_char" \
-# "type = const char" \
-# "(signed const char)"
-#gdb_test "whatis (unsigned const char) v_unsigned_char" \
-# "type = const (unsigned char|char)" \
-# "(unsigned const char)"
-#gdb_test "whatis (signed const short) v_signed_short" \
-# "type = const (short|short int|signed short|signed short int)" \
-# "(signed const short)"
-#gdb_test "whatis (unsigned const short) v_unsigned_short" \
-# "type = const (unsigned short|short unsigned int)" \
-# "(unsigned const short)"
-#gdb_test "whatis (signed const int) v_signed_int" \
-# "type = const (signed int|int)" \
-# "(signed const int)"
-#gdb_test "whatis (unsigned const int) v_unsigned_int" \
-# "type = const unsigned int" \
-# "(unsigned const int)"
-#gdb_test "whatis (signed const long) v_signed_long" \
-# "type = const (signed |)long( int|)" \
-# "(signed const long)"
-#gdb_test "whatis (unsigned const long) v_unsigned_long" \
-# "type = const (unsigned long|long unsigned int)" \
-# "(unsigned const long)"
-#gdb_test "whatis (signed const long long) v_signed_long_long" \
-# "type = const (signed |)long long( int|)" \
-# "(signed const long long)"
-#gdb_test "whatis (unsigned const long long) v_unsigned_long_long" \
-# "type = const (unsigned long long|long long unsigned int)" \
-# "(const unsigned long long)"
-
-#gdb_test "whatis (signed volatile char) v_signed_char" \
-# "type = volatile char" \
-# "(signed volatile char)"
-#gdb_test "whatis (unsigned volatile char) v_unsigned_char" \
-# "type = volatile (unsigned char|char)" \
-# "(unsigned volatile char)"
-#gdb_test "whatis (signed volatile short) v_signed_short" \
-# "type = volatile (short|short int|signed short|signed short int)" \
-# "(signed volatile short)"
-#gdb_test "whatis (unsigned volatile short) v_unsigned_short" \
-# "type = volatile (unsigned short|short unsigned int)" \
-# "(unsigned volatile short)"
-#gdb_test "whatis (signed volatile int) v_signed_int" \
-# "type = volatile (signed int|int)" \
-# "(signed volatile int)"
-#gdb_test "whatis (unsigned volatile int) v_unsigned_int" \
-# "type = volatile unsigned int" \
-# "(unsigned volatile int)"
-#gdb_test "whatis (signed volatile long) v_signed_long" \
-# "type = volatile (signed |)long( int|)" \
-# "(signed volatile long)"
-#gdb_test "whatis (unsigned volatile long) v_unsigned_long" \
-# "type = volatile (unsigned long|long unsigned int)" \
-# "(unsigned volatile long)"
-#gdb_test "whatis (signed volatile long long) v_signed_long_long" \
-# "type = volatile (signed |)long long( int|)" \
-# "(signed volatile long long)"
-#gdb_test "whatis (unsigned volatile long long) v_unsigned_long_long" \
-# "type = volatile (unsigned long long|long long unsigned int)" \
-# "(unsigned volatile long long)"
-
-#
-# Now put the 'const' and 'volatile' keywords after the base type.
-#
-
-gdb_test "whatis (char const) v_char" \
- "type = const char" \
- "(char const)"
-gdb_test "whatis (signed char const) v_signed_char" \
- "type = const signed char" \
- "(signed char const)"
-gdb_test "whatis (unsigned char const) v_unsigned_char" \
- "type = const (unsigned char|char)" \
- "(unsigned char const)"
-gdb_test "whatis (short const) v_short" \
- "type = const (short|short int)" \
- "(short const)"
-gdb_test "whatis (signed short const) v_signed_short" \
- "type = const (short|short int|signed short|signed short int)" \
- "(signed short const)"
-gdb_test "whatis (unsigned short const) v_unsigned_short" \
- "type = const (unsigned short|short unsigned int)" \
- "(unsigned short const)"
-gdb_test "whatis (int const) v_int" \
- "type = const int" \
- "(int const)"
-gdb_test "whatis (signed int const) v_signed_int" \
- "type = const (signed int|int)" \
- "(signed int const)"
-gdb_test "whatis (unsigned int const) v_unsigned_int" \
- "type = const unsigned int" \
- "(unsigned int const)"
-gdb_test "whatis (long const) v_long" \
- "type = const (long|long int)" \
- "(long const)"
-gdb_test "whatis (signed long const) v_signed_long" \
- "type = const (signed |)long( int|)" \
- "(signed long const)"
-gdb_test "whatis (unsigned long const) v_unsigned_long" \
- "type = const (unsigned long|long unsigned int)" \
- "(unsigned long const)"
-gdb_test "whatis (long long const) v_long_long" \
- "type = const long long( int|)" \
- "(long long const)"
-gdb_test "whatis (signed long long const) v_signed_long_long" \
- "type = const (signed |)long long( int|)" \
- "(signed long long const)"
-gdb_test "whatis (unsigned long long const) v_unsigned_long_long" \
- "type = const (unsigned long long|long long unsigned int)" \
- "(unsigned long long const)"
-gdb_test "whatis (float const) v_float" \
- "type = const float" \
- "(float const)"
-gdb_test "whatis (double const) v_double" \
- "type = const double" \
- "(double const)"
-
-gdb_test "whatis (char volatile) v_char" \
- "type = volatile char" \
- "(char volatile)"
-gdb_test "whatis (signed char volatile) v_signed_char" \
- "type = volatile signed char" \
- "(signed char volatile)"
-gdb_test "whatis (unsigned char volatile) v_unsigned_char" \
- "type = volatile (unsigned char|char)" \
- "(unsigned char volatile)"
-gdb_test "whatis (short volatile) v_short" \
- "type = volatile (short|short int)" \
- "(short volatile)"
-gdb_test "whatis (signed short volatile) v_signed_short" \
- "type = volatile (short|short int|signed short|signed short int)" \
- "(signed short volatile)"
-gdb_test "whatis (unsigned short volatile) v_unsigned_short" \
- "type = volatile (unsigned short|short unsigned int)" \
- "(unsigned short volatile)"
-gdb_test "whatis (int volatile) v_int" \
- "type = volatile int" \
- "(int volatile)"
-gdb_test "whatis (signed int volatile) v_signed_int" \
- "type = volatile (signed int|int)" \
- "(signed int volatile)"
-gdb_test "whatis (unsigned int volatile) v_unsigned_int" \
- "type = volatile unsigned int" \
- "(unsigned int volatile)"
-gdb_test "whatis (long volatile) v_long" \
- "type = volatile (long|long int)" \
- "(long volatile)"
-gdb_test "whatis (signed long volatile) v_signed_long" \
- "type = volatile (signed |)long( int|)" \
- "(signed long volatile)"
-gdb_test "whatis (unsigned long volatile) v_unsigned_long" \
- "type = volatile (unsigned long|long unsigned int)" \
- "(unsigned long volatile)"
-gdb_test "whatis (long long volatile) v_long_long" \
- "type = volatile long long( int|)" \
- "(long long volatile)"
-gdb_test "whatis (signed long long volatile) v_signed_long_long" \
- "type = volatile (signed |)long long( int|)" \
- "(signed long long volatile)"
-gdb_test "whatis (unsigned long long volatile) v_unsigned_long_long" \
- "type = volatile (unsigned long long|long long unsigned int)" \
- "(unsigned long long volatile)"
-gdb_test "whatis (float volatile) v_float" \
- "type = volatile float" \
- "(float volatile)"
-gdb_test "whatis (double volatile) v_double" \
- "type = volatile double" \
- "(double volatile)"
-
-#
-# enums
-#
-
-gdb_test "whatis (const enum misordered) v_misordered" \
- "type = const enum misordered" \
- "(const enum misordered)"
-gdb_test "whatis (enum misordered const) v_misordered" \
- "type = const enum misordered" \
- "(enum misordered const)"
-gdb_test "whatis (volatile enum misordered) v_misordered" \
- "type = volatile enum misordered" \
- "(volatile enum misordered)"
-gdb_test "whatis (enum misordered volatile) v_misordered" \
- "type = volatile enum misordered" \
- "(enum misordered volatile)"
-
-#
-# Pointers
-#
-
-gdb_test "whatis (const int *) v_int_pointer" \
- "type = const int${ws}\\*" \
- "(const int *)"
-gdb_test "whatis (int const *) v_int_pointer" \
- "type = const int${ws}\\*" \
- "(int const *)"
-gdb_test "whatis (int * const) v_int_pointer" \
- "type = int \\*${ws}const" \
- "(int * const)"
-gdb_test "whatis (const int * const) v_int_pointer" \
- "type = const int${ws}\\*${ws}const" \
- "(const int * const)"
-gdb_test "whatis (int const * const) v_int_pointer" \
- "type = const int${ws}\\*${ws}const" \
- "(int const * const)"
-
-gdb_test "whatis (const int **) v_int_pointer_pointer" \
- "type = const int${ws}\\*${ws}\\*" \
- "(const int **)"
-gdb_test "whatis (int const **) v_int_pointer_pointer" \
- "type = const int${ws}\\*${ws}\\*" \
- "(int const **)"
-gdb_test "whatis (int ** const) v_int_pointer_pointer" \
- "type = int \\*${ws}\\*${ws}const" \
- "(int ** const)"
-gdb_test "whatis (const int * const *) v_int_pointer_pointer" \
- "type = const int${ws}\\*${ws}const${ws}\\*" \
- "(const int * const *)"
-gdb_test "whatis (int const * const *) v_int_pointer_pointer" \
- "type = const int${ws}\\*${ws}const${ws}\\*" \
- "(int const * const *)"
-gdb_test "whatis (const int * const * const) v_int_pointer_pointer" \
- "type = const int${ws}\\*${ws}const${ws}\\*${ws}const" \
- "(const int * const * const)"
-gdb_test "whatis (int const * const * const) v_int_pointer_pointer" \
- "type = const int${ws}\\*${ws}const${ws}\\*${ws}const" \
- "(int const * const * const)"
-
-#
-# Arrays TODO
-#
-
-#
-# Pointers to arrays, arrays of pointers TODO
-#
-
-#
-# Structs and Unions
-#
-
-gdb_test "whatis (const struct t_struct) v_struct1" \
- "type = const struct t_struct" \
- "(const struct t_struct)"
-gdb_test "whatis (const union t_union) v_union" \
- "type = const union t_union" \
- "(const union t_union)"
-gdb_test "whatis (struct t_struct const) v_struct1" \
- "type = const struct t_struct" \
- "(struct t_struct const)"
-gdb_test "whatis (union t_union const) v_union" \
- "type = const union t_union" \
- "(union t_union const)"
-gdb_test "whatis (const struct t_struct *) &v_struct1" \
- "type = const struct t_struct${ws}\\*" \
- "(const struct t_struct *)"
-gdb_test "whatis (const union t_union *) &v_union" \
- "type = const union t_union${ws}\\*" \
- "(const union t_union *)"
-gdb_test "whatis (struct t_struct const *) &v_struct1" \
- "type = const struct t_struct${ws}\\*" \
- "(struct t_struct const *)"
-gdb_test "whatis (union t_union const *) &v_union" \
- "type = const union t_union${ws}\\*" \
- "(union t_union const *)"
-gdb_test "whatis (struct t_struct * const) &v_struct1" \
- "type = struct t_struct${ws}\\*${ws}const" \
- "(struct t_struct * const)"
-gdb_test "whatis (union t_union * const) &v_union" \
- "type = union t_union${ws}\\*${ws}const" \
- "(union t_union * const)"
-gdb_test "whatis (const struct t_struct * const) &v_struct1" \
- "type = const struct t_struct${ws}\\*${ws}const" \
- "(const struct t_struct * const)"
-gdb_test "whatis (const union t_union * const) &v_union" \
- "type = const union t_union${ws}\\*${ws}const" \
- "(const union t_union * const)"
-gdb_test "whatis (struct t_struct const * const) &v_struct1" \
- "type = const struct t_struct${ws}\\*${ws}const" \
- "(struct t_struct const * const)"
-gdb_test "whatis (union t_union const * const) &v_union" \
- "type = const union t_union${ws}\\*${ws}const" \
- "(union t_union const * const)"
-
-#
-# Function pointers TODO
-#
-
diff --git a/gdb/testsuite/gdb.base/cvexpr.exp b/gdb/testsuite/gdb.base/cvexpr.exp
index 482eff752ca..17143ba66a3 100644
--- a/gdb/testsuite/gdb.base/cvexpr.exp
+++ b/gdb/testsuite/gdb.base/cvexpr.exp
@@ -18,475 +18,495 @@
# This file is part of the gdb testsuite
# Tests for type expressions using const and volatile keywords.
-#
-# test running programs
-#
-
standard_testfile .c
-if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
- untested "failed to compile"
- return -1
-}
+# Compile the test using OPTIONS into a sub-directory DIR, and then
+# run the test.
+proc do_test {dir options} {
+ global srcfile testfile
-clean_restart ${binfile}
+ set binfile [standard_output_file ${dir}/${testfile}]
+ if { [prepare_for_testing "failed to prepare" ${binfile} \
+ [list $srcfile] $options] } {
+ return 0
+ }
-gdb_test_no_output "set print sevenbit-strings"
-gdb_test_no_output "set print address off"
-gdb_test_no_output "set width 0"
+ clean_restart ${binfile}
-set ws "\[ \t\]*"
+ gdb_test_no_output "set print sevenbit-strings"
+ gdb_test_no_output "set print address off"
+ gdb_test_no_output "set width 0"
-#
-# Test casting a scalar to const
-#
+ set ws "\[ \t\]*"
+
+ #
+ # Test casting a scalar to const
+ #
-gdb_test "whatis (const char) v_char" \
+ gdb_test "whatis (const char) v_char" \
"type = const char" \
"(const char)"
-gdb_test "whatis (const signed char) v_signed_char" \
+ gdb_test "whatis (const signed char) v_signed_char" \
"type = const signed char" \
"(const signed char)"
-gdb_test "whatis (const unsigned char) v_unsigned_char" \
+ gdb_test "whatis (const unsigned char) v_unsigned_char" \
"type = const (unsigned char|char)" \
"(const unsigned char)"
-gdb_test "whatis (const short) v_short" \
+ gdb_test "whatis (const short) v_short" \
"type = const (short|short int)" \
"(const short)"
-gdb_test "whatis (const signed short) v_signed_short" \
+ gdb_test "whatis (const signed short) v_signed_short" \
"type = const (short|short int|signed short|signed short int)" \
"(const signed short)"
-gdb_test "whatis (const unsigned short) v_unsigned_short" \
+ gdb_test "whatis (const unsigned short) v_unsigned_short" \
"type = const (unsigned short|short unsigned int)" \
"(const unsigned short)"
-gdb_test "whatis (const int) v_int" \
+ gdb_test "whatis (const int) v_int" \
"type = const int" \
"(const int)"
-gdb_test "whatis (const signed int) v_signed_int" \
+ gdb_test "whatis (const signed int) v_signed_int" \
"type = const (signed int|int)" \
"(const signed int)"
-gdb_test "whatis (const unsigned int) v_unsigned_int" \
+ gdb_test "whatis (const unsigned int) v_unsigned_int" \
"type = const unsigned int" \
"(const unsigned int)"
-gdb_test "whatis (const long) v_long" \
+ gdb_test "whatis (const long) v_long" \
"type = const (long|long int)" \
"(const long)"
-gdb_test "whatis (const signed long) v_signed_long" \
+ gdb_test "whatis (const signed long) v_signed_long" \
"type = const (signed |)long( int|)" \
"(const signed long)"
-gdb_test "whatis (const unsigned long) v_unsigned_long" \
+ gdb_test "whatis (const unsigned long) v_unsigned_long" \
"type = const (unsigned long|long unsigned int)" \
"(const unsigned long)"
-gdb_test "whatis (const long long) v_long_long" \
+ gdb_test "whatis (const long long) v_long_long" \
"type = const long long( int|)" \
"(const long long)"
-gdb_test "whatis (const signed long long) v_signed_long_long" \
+ gdb_test "whatis (const signed long long) v_signed_long_long" \
"type = const (signed |)long long( int|)" \
"(const signed long long)"
-gdb_test "whatis (const unsigned long long) v_unsigned_long_long" \
+ gdb_test "whatis (const unsigned long long) v_unsigned_long_long" \
"type = const (unsigned long long|long long unsigned int)" \
"(const unsigned long long)"
-gdb_test "whatis (const float) v_float" \
+ gdb_test "whatis (const float) v_float" \
"type = const float" \
"(const float)"
-gdb_test "whatis (const double) v_double" \
+ gdb_test "whatis (const double) v_double" \
"type = const double" \
"(const double)"
-#
-# Test casting a scalar to volatile
-#
+ #
+ # Test casting a scalar to volatile
+ #
-gdb_test "whatis (volatile char) v_char" \
+ gdb_test "whatis (volatile char) v_char" \
"type = volatile char" \
"(volatile char)"
-gdb_test "whatis (volatile signed char) v_signed_char" \
+ gdb_test "whatis (volatile signed char) v_signed_char" \
"type = volatile signed char" \
"(volatile signed char)"
-gdb_test "whatis (volatile unsigned char) v_unsigned_char" \
+ gdb_test "whatis (volatile unsigned char) v_unsigned_char" \
"type = volatile (unsigned char|char)" \
"(volatile unsigned char)"
-gdb_test "whatis (volatile short) v_short" \
+ gdb_test "whatis (volatile short) v_short" \
"type = volatile (short|short int)" \
"(volatile short)"
-gdb_test "whatis (volatile signed short) v_signed_short" \
+ gdb_test "whatis (volatile signed short) v_signed_short" \
"type = volatile (short|short int|signed short|signed short int)" \
"(volatile signed short)"
-gdb_test "whatis (volatile unsigned short) v_unsigned_short" \
+ gdb_test "whatis (volatile unsigned short) v_unsigned_short" \
"type = volatile (unsigned short|short unsigned int)" \
"(volatile unsigned short)"
-gdb_test "whatis (volatile int) v_int" \
+ gdb_test "whatis (volatile int) v_int" \
"type = volatile int" \
"(volatile int)"
-gdb_test "whatis (volatile signed int) v_signed_int" \
+ gdb_test "whatis (volatile signed int) v_signed_int" \
"type = volatile (signed int|int)" \
"(volatile signed int)"
-gdb_test "whatis (volatile unsigned int) v_unsigned_int" \
+ gdb_test "whatis (volatile unsigned int) v_unsigned_int" \
"type = volatile unsigned int" \
"(volatile unsigned int)"
-gdb_test "whatis (volatile long) v_long" \
+ gdb_test "whatis (volatile long) v_long" \
"type = volatile (long|long int)" \
"(volatile long)"
-gdb_test "whatis (volatile signed long) v_signed_long" \
+ gdb_test "whatis (volatile signed long) v_signed_long" \
"type = volatile (signed |)long( int|)" \
"(volatile signed long)"
-gdb_test "whatis (volatile unsigned long) v_unsigned_long" \
+ gdb_test "whatis (volatile unsigned long) v_unsigned_long" \
"type = volatile (unsigned long|long unsigned int)" \
"(volatile unsigned long)"
-gdb_test "whatis (volatile long long) v_long_long" \
+ gdb_test "whatis (volatile long long) v_long_long" \
"type = volatile long long( int|)" \
"(volatile long long)"
-gdb_test "whatis (volatile signed long long) v_signed_long_long" \
+ gdb_test "whatis (volatile signed long long) v_signed_long_long" \
"type = volatile (signed |)long long( int|)" \
"(volatile signed long long)"
-gdb_test "whatis (volatile unsigned long long) v_unsigned_long_long" \
+ gdb_test "whatis (volatile unsigned long long) v_unsigned_long_long" \
"type = volatile (unsigned long long|long long unsigned int)" \
"(volatile unsigned long long)"
-gdb_test "whatis (volatile float) v_float" \
+ gdb_test "whatis (volatile float) v_float" \
"type = volatile float" \
"(volatile float)"
-gdb_test "whatis (volatile double) v_double" \
+ gdb_test "whatis (volatile double) v_double" \
"type = volatile double" \
"(volatile double)"
-#
-# Combine const and volatile
-#
+ #
+ # Combine const and volatile
+ #
-gdb_test "whatis (const volatile int) v_int" \
+ gdb_test "whatis (const volatile int) v_int" \
"type = const volatile int" \
"(const volatile int)"
-gdb_test "whatis (volatile const int) v_int" \
+ gdb_test "whatis (volatile const int) v_int" \
"type = const volatile int" \
"(volatile const int)"
-gdb_test "whatis (const int volatile) v_int" \
+ gdb_test "whatis (const int volatile) v_int" \
"type = const volatile int" \
"(const int volatile)"
-gdb_test "whatis (volatile int const) v_int" \
+ gdb_test "whatis (volatile int const) v_int" \
"type = const volatile int" \
"(volatile int const)"
-gdb_test "whatis (int const volatile) v_int" \
+ gdb_test "whatis (int const volatile) v_int" \
"type = const volatile int" \
"(int const volatile)"
-gdb_test "whatis (int volatile const) v_int" \
+ gdb_test "whatis (int volatile const) v_int" \
"type = const volatile int" \
"(int volatile const)"
-gdb_test "whatis (const volatile int *) v_int_pointer" \
+ gdb_test "whatis (const volatile int *) v_int_pointer" \
"type = const volatile int${ws}\\*" \
"(const volatile int *)"
-gdb_test "whatis (volatile const int *) v_int_pointer" \
+ gdb_test "whatis (volatile const int *) v_int_pointer" \
"type = const volatile int${ws}\\*" \
"(volatile const int *)"
-gdb_test "whatis (const int volatile *) v_int_pointer" \
+ gdb_test "whatis (const int volatile *) v_int_pointer" \
"type = const volatile int${ws}\\*" \
- "(const int volatile)"
-gdb_test "whatis (volatile int const *) v_int_pointer" \
+ "(const int volatile *)"
+ gdb_test "whatis (volatile int const *) v_int_pointer" \
"type = const volatile int${ws}\\*" \
"(volatile int const *)"
-gdb_test "whatis (int const volatile *) v_int_pointer" \
+ gdb_test "whatis (int const volatile *) v_int_pointer" \
"type = const volatile int${ws}\\*" \
"(int const volatile *)"
-gdb_test "whatis (int volatile const *) v_int_pointer" \
+ gdb_test "whatis (int volatile const *) v_int_pointer" \
"type = const volatile int${ws}\\*" \
"(int volatile const *)"
-gdb_test "whatis (int * const volatile) v_int_pointer" \
+ gdb_test "whatis (int * const volatile) v_int_pointer" \
"type = int${ws}\\*${ws}const volatile" \
"(int * const volatile)"
-gdb_test "whatis (int * volatile const) v_int_pointer" \
+ gdb_test "whatis (int * volatile const) v_int_pointer" \
"type = int${ws}\\*${ws}const volatile" \
"(int * volatile const)"
-#
-# Put 'signed' and 'unsigned' before const/volatile (FIXME)
-#
-
-#gdb_test "whatis (signed const char) v_signed_char" \
-# "type = const char" \
-# "(signed const char)"
-#gdb_test "whatis (unsigned const char) v_unsigned_char" \
-# "type = const (unsigned char|char)" \
-# "(unsigned const char)"
-#gdb_test "whatis (signed const short) v_signed_short" \
-# "type = const (short|short int|signed short|signed short int)" \
-# "(signed const short)"
-#gdb_test "whatis (unsigned const short) v_unsigned_short" \
-# "type = const (unsigned short|short unsigned int)" \
-# "(unsigned const short)"
-#gdb_test "whatis (signed const int) v_signed_int" \
-# "type = const (signed int|int)" \
-# "(signed const int)"
-#gdb_test "whatis (unsigned const int) v_unsigned_int" \
-# "type = const unsigned int" \
-# "(unsigned const int)"
-#gdb_test "whatis (signed const long) v_signed_long" \
-# "type = const (signed |)long( int|)" \
-# "(signed const long)"
-#gdb_test "whatis (unsigned const long) v_unsigned_long" \
-# "type = const (unsigned long|long unsigned int)" \
-# "(unsigned const long)"
-#gdb_test "whatis (signed const long long) v_signed_long_long" \
-# "type = const (signed |)long long( int|)" \
-# "(signed const long long)"
-#gdb_test "whatis (unsigned const long long) v_unsigned_long_long" \
-# "type = const (unsigned long long|long long unsigned int)" \
-# "(const unsigned long long)"
-
-#gdb_test "whatis (signed volatile char) v_signed_char" \
-# "type = volatile char" \
-# "(signed volatile char)"
-#gdb_test "whatis (unsigned volatile char) v_unsigned_char" \
-# "type = volatile (unsigned char|char)" \
-# "(unsigned volatile char)"
-#gdb_test "whatis (signed volatile short) v_signed_short" \
-# "type = volatile (short|short int|signed short|signed short int)" \
-# "(signed volatile short)"
-#gdb_test "whatis (unsigned volatile short) v_unsigned_short" \
-# "type = volatile (unsigned short|short unsigned int)" \
-# "(unsigned volatile short)"
-#gdb_test "whatis (signed volatile int) v_signed_int" \
-# "type = volatile (signed int|int)" \
-# "(signed volatile int)"
-#gdb_test "whatis (unsigned volatile int) v_unsigned_int" \
-# "type = volatile unsigned int" \
-# "(unsigned volatile int)"
-#gdb_test "whatis (signed volatile long) v_signed_long" \
-# "type = volatile (signed |)long( int|)" \
-# "(signed volatile long)"
-#gdb_test "whatis (unsigned volatile long) v_unsigned_long" \
-# "type = volatile (unsigned long|long unsigned int)" \
-# "(unsigned volatile long)"
-#gdb_test "whatis (signed volatile long long) v_signed_long_long" \
-# "type = volatile (signed |)long long( int|)" \
-# "(signed volatile long long)"
-#gdb_test "whatis (unsigned volatile long long) v_unsigned_long_long" \
-# "type = volatile (unsigned long long|long long unsigned int)" \
-# "(unsigned volatile long long)"
-
-#
-# Now put the 'const' and 'volatile' keywords after the base type.
-#
-
-gdb_test "whatis (char const) v_char" \
+ #
+ # Put 'signed' and 'unsigned' before const/volatile
+ #
+
+ #gdb_test "whatis (signed const char) v_signed_char" \
+ # "type = const char" \
+ # "(signed const char)"
+ #gdb_test "whatis (unsigned const char) v_unsigned_char" \
+ # "type = const (unsigned char|char)" \
+ # "(unsigned const char)"
+ #gdb_test "whatis (signed const short) v_signed_short" \
+ # "type = const (short|short int|signed short|signed short int)" \
+ # "(signed const short)"
+ #gdb_test "whatis (unsigned const short) v_unsigned_short" \
+ # "type = const (unsigned short|short unsigned int)" \
+ # "(unsigned const short)"
+ #gdb_test "whatis (signed const int) v_signed_int" \
+ # "type = const (signed int|int)" \
+ # "(signed const int)"
+ #gdb_test "whatis (unsigned const int) v_unsigned_int" \
+ # "type = const unsigned int" \
+ # "(unsigned const int)"
+ #gdb_test "whatis (signed const long) v_signed_long" \
+ # "type = const (signed |)long( int|)" \
+ # "(signed const long)"
+ #gdb_test "whatis (unsigned const long) v_unsigned_long" \
+ # "type = const (unsigned long|long unsigned int)" \
+ # "(unsigned const long)"
+ #gdb_test "whatis (signed const long long) v_signed_long_long" \
+ # "type = const (signed |)long long( int|)" \
+ # "(signed const long long)"
+ #gdb_test "whatis (unsigned const long long) v_unsigned_long_long" \
+ # "type = const (unsigned long long|long long unsigned int)" \
+ # "(const unsigned long long)"
+
+ #gdb_test "whatis (signed volatile char) v_signed_char" \
+ # "type = volatile char" \
+ # "(signed volatile char)"
+ #gdb_test "whatis (unsigned volatile char) v_unsigned_char" \
+ # "type = volatile (unsigned char|char)" \
+ # "(unsigned volatile char)"
+ #gdb_test "whatis (signed volatile short) v_signed_short" \
+ # "type = volatile (short|short int|signed short|signed short int)" \
+ # "(signed volatile short)"
+ #gdb_test "whatis (unsigned volatile short) v_unsigned_short" \
+ # "type = volatile (unsigned short|short unsigned int)" \
+ # "(unsigned volatile short)"
+ #gdb_test "whatis (signed volatile int) v_signed_int" \
+ # "type = volatile (signed int|int)" \
+ # "(signed volatile int)"
+ #gdb_test "whatis (unsigned volatile int) v_unsigned_int" \
+ # "type = volatile unsigned int" \
+ # "(unsigned volatile int)"
+ #gdb_test "whatis (signed volatile long) v_signed_long" \
+ # "type = volatile (signed |)long( int|)" \
+ # "(signed volatile long)"
+ #gdb_test "whatis (unsigned volatile long) v_unsigned_long" \
+ # "type = volatile (unsigned long|long unsigned int)" \
+ # "(unsigned volatile long)"
+ #gdb_test "whatis (signed volatile long long) v_signed_long_long" \
+ # "type = volatile (signed |)long long( int|)" \
+ # "(signed volatile long long)"
+ #gdb_test "whatis (unsigned volatile long long) v_unsigned_long_long" \
+ # "type = volatile (unsigned long long|long long unsigned int)" \
+ # "(unsigned volatile long long)"
+
+ #
+ # Now put the 'const' and 'volatile' keywords after the base type.
+ #
+
+ gdb_test "whatis (char const) v_char" \
"type = const char" \
"(char const)"
-gdb_test "whatis (signed char const) v_signed_char" \
+ gdb_test "whatis (signed char const) v_signed_char" \
"type = const signed char" \
"(signed char const)"
-gdb_test "whatis (unsigned char const) v_unsigned_char" \
+ gdb_test "whatis (unsigned char const) v_unsigned_char" \
"type = const (unsigned char|char)" \
"(unsigned char const)"
-gdb_test "whatis (short const) v_short" \
+ gdb_test "whatis (short const) v_short" \
"type = const (short|short int)" \
"(short const)"
-gdb_test "whatis (signed short const) v_signed_short" \
+ gdb_test "whatis (signed short const) v_signed_short" \
"type = const (short|short int|signed short|signed short int)" \
"(signed short const)"
-gdb_test "whatis (unsigned short const) v_unsigned_short" \
+ gdb_test "whatis (unsigned short const) v_unsigned_short" \
"type = const (unsigned short|short unsigned int)" \
"(unsigned short const)"
-gdb_test "whatis (int const) v_int" \
+ gdb_test "whatis (int const) v_int" \
"type = const int" \
"(int const)"
-gdb_test "whatis (signed int const) v_signed_int" \
+ gdb_test "whatis (signed int const) v_signed_int" \
"type = const (signed int|int)" \
"(signed int const)"
-gdb_test "whatis (unsigned int const) v_unsigned_int" \
+ gdb_test "whatis (unsigned int const) v_unsigned_int" \
"type = const unsigned int" \
"(unsigned int const)"
-gdb_test "whatis (long const) v_long" \
+ gdb_test "whatis (long const) v_long" \
"type = const (long|long int)" \
"(long const)"
-gdb_test "whatis (signed long const) v_signed_long" \
+ gdb_test "whatis (signed long const) v_signed_long" \
"type = const (signed |)long( int|)" \
"(signed long const)"
-gdb_test "whatis (unsigned long const) v_unsigned_long" \
+ gdb_test "whatis (unsigned long const) v_unsigned_long" \
"type = const (unsigned long|long unsigned int)" \
"(unsigned long const)"
-gdb_test "whatis (long long const) v_long_long" \
+ gdb_test "whatis (long long const) v_long_long" \
"type = const long long( int|)" \
"(long long const)"
-gdb_test "whatis (signed long long const) v_signed_long_long" \
+ gdb_test "whatis (signed long long const) v_signed_long_long" \
"type = const (signed |)long long( int|)" \
"(signed long long const)"
-gdb_test "whatis (unsigned long long const) v_unsigned_long_long" \
+ gdb_test "whatis (unsigned long long const) v_unsigned_long_long" \
"type = const (unsigned long long|long long unsigned int)" \
"(unsigned long long const)"
-gdb_test "whatis (float const) v_float" \
+ gdb_test "whatis (float const) v_float" \
"type = const float" \
"(float const)"
-gdb_test "whatis (double const) v_double" \
+ gdb_test "whatis (double const) v_double" \
"type = const double" \
"(double const)"
-gdb_test "whatis (char volatile) v_char" \
+ gdb_test "whatis (char volatile) v_char" \
"type = volatile char" \
"(char volatile)"
-gdb_test "whatis (signed char volatile) v_signed_char" \
+ gdb_test "whatis (signed char volatile) v_signed_char" \
"type = volatile signed char" \
"(signed char volatile)"
-gdb_test "whatis (unsigned char volatile) v_unsigned_char" \
+ gdb_test "whatis (unsigned char volatile) v_unsigned_char" \
"type = volatile (unsigned char|char)" \
"(unsigned char volatile)"
-gdb_test "whatis (short volatile) v_short" \
+ gdb_test "whatis (short volatile) v_short" \
"type = volatile (short|short int)" \
"(short volatile)"
-gdb_test "whatis (signed short volatile) v_signed_short" \
+ gdb_test "whatis (signed short volatile) v_signed_short" \
"type = volatile (short|short int|signed short|signed short int)" \
"(signed short volatile)"
-gdb_test "whatis (unsigned short volatile) v_unsigned_short" \
+ gdb_test "whatis (unsigned short volatile) v_unsigned_short" \
"type = volatile (unsigned short|short unsigned int)" \
"(unsigned short volatile)"
-gdb_test "whatis (int volatile) v_int" \
+ gdb_test "whatis (int volatile) v_int" \
"type = volatile int" \
"(int volatile)"
-gdb_test "whatis (signed int volatile) v_signed_int" \
+ gdb_test "whatis (signed int volatile) v_signed_int" \
"type = volatile (signed int|int)" \
"(signed int volatile)"
-gdb_test "whatis (unsigned int volatile) v_unsigned_int" \
+ gdb_test "whatis (unsigned int volatile) v_unsigned_int" \
"type = volatile unsigned int" \
"(unsigned int volatile)"
-gdb_test "whatis (long volatile) v_long" \
+ gdb_test "whatis (long volatile) v_long" \
"type = volatile (long|long int)" \
"(long volatile)"
-gdb_test "whatis (signed long volatile) v_signed_long" \
+ gdb_test "whatis (signed long volatile) v_signed_long" \
"type = volatile (signed |)long( int|)" \
"(signed long volatile)"
-gdb_test "whatis (unsigned long volatile) v_unsigned_long" \
+ gdb_test "whatis (unsigned long volatile) v_unsigned_long" \
"type = volatile (unsigned long|long unsigned int)" \
"(unsigned long volatile)"
-gdb_test "whatis (long long volatile) v_long_long" \
+ gdb_test "whatis (long long volatile) v_long_long" \
"type = volatile long long( int|)" \
"(long long volatile)"
-gdb_test "whatis (signed long long volatile) v_signed_long_long" \
+ gdb_test "whatis (signed long long volatile) v_signed_long_long" \
"type = volatile (signed |)long long( int|)" \
"(signed long long volatile)"
-gdb_test "whatis (unsigned long long volatile) v_unsigned_long_long" \
+ gdb_test "whatis (unsigned long long volatile) v_unsigned_long_long" \
"type = volatile (unsigned long long|long long unsigned int)" \
"(unsigned long long volatile)"
-gdb_test "whatis (float volatile) v_float" \
+ gdb_test "whatis (float volatile) v_float" \
"type = volatile float" \
"(float volatile)"
-gdb_test "whatis (double volatile) v_double" \
+ gdb_test "whatis (double volatile) v_double" \
"type = volatile double" \
"(double volatile)"
-#
-# enums
-#
+ #
+ # enums
+ #
-gdb_test "whatis (const enum misordered) v_misordered" \
+ gdb_test "whatis (const enum misordered) v_misordered" \
"type = const enum misordered" \
"(const enum misordered)"
-gdb_test "whatis (enum misordered const) v_misordered" \
+ gdb_test "whatis (enum misordered const) v_misordered" \
"type = const enum misordered" \
"(enum misordered const)"
-gdb_test "whatis (volatile enum misordered) v_misordered" \
+ gdb_test "whatis (volatile enum misordered) v_misordered" \
"type = volatile enum misordered" \
"(volatile enum misordered)"
-gdb_test "whatis (enum misordered volatile) v_misordered" \
+ gdb_test "whatis (enum misordered volatile) v_misordered" \
"type = volatile enum misordered" \
"(enum misordered volatile)"
-#
-# Pointers
-#
+ #
+ # Pointers
+ #
-gdb_test "whatis (const int *) v_int_pointer" \
+ gdb_test "whatis (const int *) v_int_pointer" \
"type = const int${ws}\\*" \
"(const int *)"
-gdb_test "whatis (int const *) v_int_pointer" \
+ gdb_test "whatis (int const *) v_int_pointer" \
"type = const int${ws}\\*" \
"(int const *)"
-gdb_test "whatis (int * const) v_int_pointer" \
+ gdb_test "whatis (int * const) v_int_pointer" \
"type = int \\*${ws}const" \
"(int * const)"
-gdb_test "whatis (const int * const) v_int_pointer" \
+ gdb_test "whatis (const int * const) v_int_pointer" \
"type = const int${ws}\\*${ws}const" \
"(const int * const)"
-gdb_test "whatis (int const * const) v_int_pointer" \
+ gdb_test "whatis (int const * const) v_int_pointer" \
"type = const int${ws}\\*${ws}const" \
"(int const * const)"
-gdb_test "whatis (const int **) v_int_pointer_pointer" \
+ gdb_test "whatis (const int **) v_int_pointer_pointer" \
"type = const int${ws}\\*${ws}\\*" \
"(const int **)"
-gdb_test "whatis (int const **) v_int_pointer_pointer" \
+ gdb_test "whatis (int const **) v_int_pointer_pointer" \
"type = const int${ws}\\*${ws}\\*" \
"(int const **)"
-gdb_test "whatis (int ** const) v_int_pointer_pointer" \
+ gdb_test "whatis (int ** const) v_int_pointer_pointer" \
"type = int \\*${ws}\\*${ws}const" \
"(int ** const)"
-gdb_test "whatis (const int * const *) v_int_pointer_pointer" \
+ gdb_test "whatis (const int * const *) v_int_pointer_pointer" \
"type = const int${ws}\\*${ws}const${ws}\\*" \
"(const int * const *)"
-gdb_test "whatis (int const * const *) v_int_pointer_pointer" \
+ gdb_test "whatis (int const * const *) v_int_pointer_pointer" \
"type = const int${ws}\\*${ws}const${ws}\\*" \
"(int const * const *)"
-gdb_test "whatis (const int * const * const) v_int_pointer_pointer" \
+ gdb_test "whatis (const int * const * const) v_int_pointer_pointer" \
"type = const int${ws}\\*${ws}const${ws}\\*${ws}const" \
"(const int * const * const)"
-gdb_test "whatis (int const * const * const) v_int_pointer_pointer" \
+ gdb_test "whatis (int const * const * const) v_int_pointer_pointer" \
"type = const int${ws}\\*${ws}const${ws}\\*${ws}const" \
"(int const * const * const)"
-#
-# Arrays TODO
-#
+ #
+ # Arrays TODO
+ #
-#
-# Pointers to arrays, arrays of pointers TODO
-#
+ #
+ # Pointers to arrays, arrays of pointers TODO
+ #
-#
-# Structs and Unions
-#
+ #
+ # Structs and Unions
+ #
-gdb_test "whatis (const struct t_struct) v_struct1" \
+ gdb_test "whatis (const struct t_struct) v_struct1" \
"type = const struct t_struct" \
"(const struct t_struct)"
-gdb_test "whatis (const union t_union) v_union" \
+ gdb_test "whatis (const union t_union) v_union" \
"type = const union t_union" \
"(const union t_union)"
-gdb_test "whatis (struct t_struct const) v_struct1" \
+ gdb_test "whatis (struct t_struct const) v_struct1" \
"type = const struct t_struct" \
"(struct t_struct const)"
-gdb_test "whatis (union t_union const) v_union" \
+ gdb_test "whatis (union t_union const) v_union" \
"type = const union t_union" \
"(union t_union const)"
-gdb_test "whatis (const struct t_struct *) &v_struct1" \
+ gdb_test "whatis (const struct t_struct *) &v_struct1" \
"type = const struct t_struct${ws}\\*" \
"(const struct t_struct *)"
-gdb_test "whatis (const union t_union *) &v_union" \
+ gdb_test "whatis (const union t_union *) &v_union" \
"type = const union t_union${ws}\\*" \
"(const union t_union *)"
-gdb_test "whatis (struct t_struct const *) &v_struct1" \
+ gdb_test "whatis (struct t_struct const *) &v_struct1" \
"type = const struct t_struct${ws}\\*" \
"(struct t_struct const *)"
-gdb_test "whatis (union t_union const *) &v_union" \
+ gdb_test "whatis (union t_union const *) &v_union" \
"type = const union t_union${ws}\\*" \
"(union t_union const *)"
-gdb_test "whatis (struct t_struct * const) &v_struct1" \
+ gdb_test "whatis (struct t_struct * const) &v_struct1" \
"type = struct t_struct${ws}\\*${ws}const" \
"(struct t_struct * const)"
-gdb_test "whatis (union t_union * const) &v_union" \
+ gdb_test "whatis (union t_union * const) &v_union" \
"type = union t_union${ws}\\*${ws}const" \
"(union t_union * const)"
-gdb_test "whatis (const struct t_struct * const) &v_struct1" \
+ gdb_test "whatis (const struct t_struct * const) &v_struct1" \
"type = const struct t_struct${ws}\\*${ws}const" \
"(const struct t_struct * const)"
-gdb_test "whatis (const union t_union * const) &v_union" \
+ gdb_test "whatis (const union t_union * const) &v_union" \
"type = const union t_union${ws}\\*${ws}const" \
"(const union t_union * const)"
-gdb_test "whatis (struct t_struct const * const) &v_struct1" \
+ gdb_test "whatis (struct t_struct const * const) &v_struct1" \
"type = const struct t_struct${ws}\\*${ws}const" \
"(struct t_struct const * const)"
-gdb_test "whatis (union t_union const * const) &v_union" \
+ gdb_test "whatis (union t_union const * const) &v_union" \
"type = const union t_union${ws}\\*${ws}const" \
"(union t_union const * const)"
-#
-# Function pointers TODO
-#
+ #
+ # Function pointers TODO
+ #
+}
+# Build up the set of debug formats for which we will run this test.
+set specs { {dwarf {debug} } }
+if [compiler_supports_ctf_debug] {
+ lappend specs {ctf {"additional-flags=-gt"}}
+}
+
+# Setup and run the test for each debug format.
+foreach testspec $specs {
+ set prefix [lindex $testspec 0]
+ set opts [lindex $testspec 1]
+
+ with_test_prefix $prefix {
+ remote_exec host "rm -rf [standard_output_file ${prefix}]"
+ remote_exec host "mkdir -p [standard_output_file ${prefix}]"
+ do_test $prefix $opts
+ }
+}
--
2.14.5
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 1/2] gdb/testsuite: Introduce compiler_supports_ctf_debug guard function
2019-10-08 9:39 [PATCH 0/2] CTF Testing Changes Andrew Burgess
2019-10-08 9:39 ` [PATCH 2/2] gdb/testsuite: Merge cvexpr.exp and ctf-cvexpr.exp Andrew Burgess
@ 2019-10-08 9:39 ` Andrew Burgess
2019-10-08 21:04 ` [PATCH 0/2] CTF Testing Changes Weimin Pan
2 siblings, 0 replies; 4+ messages in thread
From: Andrew Burgess @ 2019-10-08 9:39 UTC (permalink / raw)
To: gdb-patches; +Cc: Weimin Pan, Simon Marchi, Andrew Burgess
Most versions of GCC in the wild don't support CTF debug format right
now, so, rather than attempting to compile the tests and failing each
time, this patch introduces a guard function to check if the compiler
supports CTF. If we don't have CTF support then the CTF tests are
skipped.
This patch only updates 3 of the 4 CTF tests, the fourth will be
handled in the next patch.
gdb/testsuite/ChangeLog:
* gdb.base/ctf-constvars.exp: Skip test if CTF is not supported in
the compiler. Clean up header comment a little.
* gdb.base/ctf-ptype.exp: Likewise.
* gdb.base/ctf-whatis.exp: Likewise.
* lib/gdb.exp (compiler_supports_ctf_debug): New proc.
---
gdb/testsuite/ChangeLog | 8 ++++++++
gdb/testsuite/gdb.base/ctf-constvars.exp | 20 ++++++++++----------
gdb/testsuite/gdb.base/ctf-ptype.exp | 10 +++++-----
gdb/testsuite/gdb.base/ctf-whatis.exp | 10 +++++-----
gdb/testsuite/lib/gdb.exp | 11 +++++++++++
5 files changed, 39 insertions(+), 20 deletions(-)
diff --git a/gdb/testsuite/gdb.base/ctf-constvars.exp b/gdb/testsuite/gdb.base/ctf-constvars.exp
index 4a81a94ddb4..58c0badc0c2 100644
--- a/gdb/testsuite/gdb.base/ctf-constvars.exp
+++ b/gdb/testsuite/gdb.base/ctf-constvars.exp
@@ -18,20 +18,20 @@
#
# This file is part of the gdb testsuite
#
-# tests for const variables
-# const pointers to vars
-# pointers to const variables
-# const pointers to const vars
-# with mixed types
+# Tests for: const variables,
+# const pointers to vars
+# pointers to const variables
+# const pointers to const vars
+# with mixed types.
-#
-# test running programs
-#
-# -gt generates full-fledged CTF.
+if ![compiler_supports_ctf_debug] {
+ return 0
+}
standard_testfile .c
-set opts "additional_flags=-gt"
+# Using `-gt` generates full-fledged CTF debug information.
+set opts "additional_flags=-gt"
if { [prepare_for_testing "failed to prepare" ${testfile} \
[list $srcfile] [list $opts nowarnings]] } {
return 0
diff --git a/gdb/testsuite/gdb.base/ctf-ptype.exp b/gdb/testsuite/gdb.base/ctf-ptype.exp
index 9f545824224..172f6d13a18 100644
--- a/gdb/testsuite/gdb.base/ctf-ptype.exp
+++ b/gdb/testsuite/gdb.base/ctf-ptype.exp
@@ -15,14 +15,14 @@
# This file is a subset of ptype.exp written by Rob Savoye. (rob@cygnus.com)
-#
-# test running programs
-#
-# -gt generates full-fledged CTF.
+if ![compiler_supports_ctf_debug] {
+ return 0
+}
standard_testfile .c
-set opts "additional_flags=-gt"
+# Using `-gt` generates full-fledged CTF debug information.
+set opts "additional_flags=-gt"
if { [prepare_for_testing "failed to prepare" ${testfile} \
[list $srcfile] [list $opts nowarnings]] } {
return 0
diff --git a/gdb/testsuite/gdb.base/ctf-whatis.exp b/gdb/testsuite/gdb.base/ctf-whatis.exp
index 3f26fc326e3..377eeb3314f 100644
--- a/gdb/testsuite/gdb.base/ctf-whatis.exp
+++ b/gdb/testsuite/gdb.base/ctf-whatis.exp
@@ -15,14 +15,14 @@
# This file is a subset of whatis.exp written by Rob Savoye. (rob@cygnus.com)
-#
-# test running programs
-#
-# -gt generates full-fledged CTF.
+if ![compiler_supports_ctf_debug] {
+ return 0
+}
standard_testfile .c
-set opts "additional_flags=-gt"
+# Using `-gt` generates full-fledged CTF debug information.
+set opts "additional_flags=-gt"
if { [prepare_for_testing "failed to prepare" ${testfile} \
[list $srcfile] [list $opts nowarnings]] } {
return 0
diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
index 50db45d1b14..72aab43228b 100644
--- a/gdb/testsuite/lib/gdb.exp
+++ b/gdb/testsuite/lib/gdb.exp
@@ -6733,5 +6733,16 @@ proc cmp_file_string { file str msg } {
}
}
+# Does the compiler support CTF debug output using '-gt' compiler
+# flag?
+gdb_caching_proc compiler_supports_ctf_debug {
+ verbose -log "APB: Got here."
+ return [gdb_can_simple_compile ctfdebug {
+ int main () {
+ return 0;
+ }
+ } executable "additional_flags=-gt"]
+}
+
# Always load compatibility stuff.
load_lib future.exp
--
2.14.5
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 0/2] CTF Testing Changes
@ 2019-10-08 9:39 Andrew Burgess
2019-10-08 9:39 ` [PATCH 2/2] gdb/testsuite: Merge cvexpr.exp and ctf-cvexpr.exp Andrew Burgess
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Andrew Burgess @ 2019-10-08 9:39 UTC (permalink / raw)
To: gdb-patches; +Cc: Weimin Pan, Simon Marchi, Andrew Burgess
I was taking a look through the CTF testing and I think the following
patches would be a nice clean up.
The first adds a `compiler_supports_ctf_debug` guard function, so we
don't try to run the ctf test scripts when the compiler doesn't
support ctf debug format. This seems to be inline with how most of
our other big features are guarded.
My second thought was that the 4 CTF tests added are all pretty much
copies of existing non-ctf tests. I think these tests would be better
done as variations of the original test scripts rather than making
copies. The second patch makes a start on this, deleting
ctf-cvexpr.exp and extending cvexpr.exp to cover the same cases[1].
The remaining 3 tests require a little more work as the original C
files were changed slightly, so I've not addressed these yet, but will
try to find time to look at these soon.
A final note, and something I don't have an immediate plan to address,
but Weimin might want to consider, is that we could do with a test for
CTF that doesn't rely on having a CTF compiler around, even if it is
just a very basic test. It should be possible (I think) to create
such a test by placing the raw CTF output into a .S file, and then
linking against a .c file compiled without debug. I think some of the
tests in gdb.arch/ are done like this.
[1] The original ctf-cvexpr.exp file didn't actually test ctf at all,
but just compiled with the standard -g compiler flag, resulting in
(probably) DWARF debug output. I'm assuming this is a mistake,
which I've fixed in this patch.
--
Andrew Burgess (2):
gdb/testsuite: Introduce compiler_supports_ctf_debug guard function
gdb/testsuite: Merge cvexpr.exp and ctf-cvexpr.exp
gdb/testsuite/ChangeLog | 13 +
gdb/testsuite/gdb.base/ctf-constvars.exp | 20 +-
gdb/testsuite/gdb.base/ctf-cvexpr.exp | 495 -------------------------------
gdb/testsuite/gdb.base/ctf-ptype.exp | 10 +-
gdb/testsuite/gdb.base/ctf-whatis.exp | 10 +-
gdb/testsuite/gdb.base/cvexpr.exp | 466 +++++++++++++++--------------
gdb/testsuite/lib/gdb.exp | 11 +
7 files changed, 287 insertions(+), 738 deletions(-)
delete mode 100644 gdb/testsuite/gdb.base/ctf-cvexpr.exp
--
2.14.5
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 0/2] CTF Testing Changes
2019-10-08 9:39 [PATCH 0/2] CTF Testing Changes Andrew Burgess
2019-10-08 9:39 ` [PATCH 2/2] gdb/testsuite: Merge cvexpr.exp and ctf-cvexpr.exp Andrew Burgess
2019-10-08 9:39 ` [PATCH 1/2] gdb/testsuite: Introduce compiler_supports_ctf_debug guard function Andrew Burgess
@ 2019-10-08 21:04 ` Weimin Pan
2 siblings, 0 replies; 4+ messages in thread
From: Weimin Pan @ 2019-10-08 21:04 UTC (permalink / raw)
To: Andrew Burgess, gdb-patches; +Cc: Simon Marchi
On 10/8/2019 2:39 AM, Andrew Burgess wrote:
> I was taking a look through the CTF testing and I think the following
> patches would be a nice clean up.
>
> The first adds a `compiler_supports_ctf_debug` guard function, so we
> don't try to run the ctf test scripts when the compiler doesn't
> support ctf debug format. This seems to be inline with how most of
> our other big features are guarded.
>
> My second thought was that the 4 CTF tests added are all pretty much
> copies of existing non-ctf tests. I think these tests would be better
> done as variations of the original test scripts rather than making
> copies. The second patch makes a start on this, deleting
> ctf-cvexpr.exp and extending cvexpr.exp to cover the same cases[1].
>
> The remaining 3 tests require a little more work as the original C
> files were changed slightly, so I've not addressed these yet, but will
> try to find time to look at these soon.
>
> A final note, and something I don't have an immediate plan to address,
> but Weimin might want to consider, is that we could do with a test for
> CTF that doesn't rely on having a CTF compiler around, even if it is
> just a very basic test. It should be possible (I think) to create
> such a test by placing the raw CTF output into a .S file, and then
> linking against a .c file compiled without debug. I think some of the
> tests in gdb.arch/ are done like this.
LGTM. Please note that currently the toolchain supports the ctf info for
a single compilation unit only and is expected to support multiple CU's
shortly. By which time, We may need to revisit these ctf tests and do
the necessary merging, like you did for gdb.base/ctf-cvexpr.exp and
gdb.base/cvexpr.exp, gdb.base/ctf-ptype.exp would be a good candidate
to merge with gdb.base/ptype.exp which uses more than one .c source file,
and add new tests with mixed ctf-dwarf info, for example, or linking a
.S file
with raw ctf data againt a .c file compiled without debug as you suggested .
Thanks.
>
> [1] The original ctf-cvexpr.exp file didn't actually test ctf at all,
> but just compiled with the standard -g compiler flag, resulting in
> (probably) DWARF debug output. I'm assuming this is a mistake,
> which I've fixed in this patch.
>
> --
>
> Andrew Burgess (2):
> gdb/testsuite: Introduce compiler_supports_ctf_debug guard function
> gdb/testsuite: Merge cvexpr.exp and ctf-cvexpr.exp
>
> gdb/testsuite/ChangeLog | 13 +
> gdb/testsuite/gdb.base/ctf-constvars.exp | 20 +-
> gdb/testsuite/gdb.base/ctf-cvexpr.exp | 495 -------------------------------
> gdb/testsuite/gdb.base/ctf-ptype.exp | 10 +-
> gdb/testsuite/gdb.base/ctf-whatis.exp | 10 +-
> gdb/testsuite/gdb.base/cvexpr.exp | 466 +++++++++++++++--------------
> gdb/testsuite/lib/gdb.exp | 11 +
> 7 files changed, 287 insertions(+), 738 deletions(-)
> delete mode 100644 gdb/testsuite/gdb.base/ctf-cvexpr.exp
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-10-08 21:04 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-10-08 9:39 [PATCH 0/2] CTF Testing Changes Andrew Burgess
2019-10-08 9:39 ` [PATCH 2/2] gdb/testsuite: Merge cvexpr.exp and ctf-cvexpr.exp Andrew Burgess
2019-10-08 9:39 ` [PATCH 1/2] gdb/testsuite: Introduce compiler_supports_ctf_debug guard function Andrew Burgess
2019-10-08 21:04 ` [PATCH 0/2] CTF Testing Changes Weimin Pan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).