[1/2] gdb: Merge similar tests into a single test script
Commit Message
* Tom Tromey <tom@tromey.com> [2018-08-02 12:50:08 -0600]:
> >>>>> "Andrew" == Andrew Burgess <andrew.burgess@embecosm.com> writes:
>
> Andrew> +foreach test_settings [list \
> Andrew> + [list "o1" \
> Andrew> + {debug optimize=-O1 \
> Andrew> + additional_flags=-DNOCLONE} \
> Andrew> + "6"] \
> Andrew> + [list "o3" \
> Andrew> + {debug optimize=-O3} \
> Andrew> + "<optimized out>"]\
> Andrew> + [list "o3_strict" \
> Andrew> + {debug optimize=-O3 \
> Andrew> + additional_flags=-gstrict-dwarf} \
> Andrew> + "<optimized out>"]] {
> Andrew> + set test_prefix [lindex $test_settings 0]
> Andrew> + set compile_flags [lindex $test_settings 1]
> Andrew> + set sizeof_result [lindex $test_settings 2]
>
> For constant lists you can just use {} rather than [list], like
>
> {{o1 {debug optimize=-O1...} 6}
> {o3 ... }}
>
> Also, if you flatten the list, you can use a destructuring foreach here,
> like:
>
> foreach {test_prefix compile_flags sizeof_result} {o1 {debug optimize=-O1 ...} ...}
>
> Or, alternatively, use lassign to set the values.
Thanks for the review.
Updated version, the changes are:
* Use {} to create a flattened list,
* compile_flags and sizeof_result are extracted with lassign inside
proc, and
* Comment on vla_optimized_out explaining parameters.
Thanks,
Andrew
---
gdb: Merge similar tests into a single test script
The three test scripts:
gdb/testsuite/gdb.base/vla-optimized-out.exp
gdb/testsuite/gdb.base/vla-optimized-out-o3.exp
gdb/testsuite/gdb.base/vla-optimized-out-o3-strict.exp
are all pretty similar, with differences in the compile flags used,
and some of the expected results.
Instead of maintaining 3 files, merge them into a single test script,
and use parameters to control the test behaviour.
gdb/testsuite/ChangeLog:
* gdb.base/vla-optimized-out-o3.exp: Delete.
* gdb.base/vla-optimized-out-o3-strict.exp: Delete.
* gdb.base/vla-optimized-out.exp: Extend to cover all of the
deleted tests.
---
gdb/testsuite/ChangeLog | 7 ++++
.../gdb.base/vla-optimized-out-o3-strict.exp | 40 ----------------------
gdb/testsuite/gdb.base/vla-optimized-out-o3.exp | 36 -------------------
gdb/testsuite/gdb.base/vla-optimized-out.exp | 35 ++++++++++++++-----
4 files changed, 34 insertions(+), 84 deletions(-)
delete mode 100644 gdb/testsuite/gdb.base/vla-optimized-out-o3-strict.exp
delete mode 100644 gdb/testsuite/gdb.base/vla-optimized-out-o3.exp
Comments
>>>>> "Andrew" == Andrew Burgess <andrew.burgess@embecosm.com> writes:
Andrew> Thanks for the review.
Andrew> Updated version, the changes are:
Andrew> * Use {} to create a flattened list,
Andrew> * compile_flags and sizeof_result are extracted with lassign inside
Andrew> proc, and
Andrew> * Comment on vla_optimized_out explaining parameters.
Thank you, this is ok.
Tom
deleted file mode 100644
@@ -1,40 +0,0 @@
-# Copyright 2018 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/>.
-
-# Check whether we can determine the size of an optimized-out vla.
-
-standard_testfile
-
-if { [prepare_for_testing "failed to prepare" $testfile vla-optimized-out.c \
- {debug optimize=-O3 additional_flags=-gstrict-dwarf}] } {
- return -1
-}
-
-proc vla_optimized_out { } {
- if ![runto f1] {
- fail "can't run to f1"
- return
- }
-
- gdb_test "p a" \
- { = <optimized out>} \
- "printed optimized out vla"
-
- gdb_test "p sizeof (a)" \
- { = <optimized out>} \
- "printed optimized out size of optimized out vla"
-}
-
-vla_optimized_out
deleted file mode 100644
@@ -1,36 +0,0 @@
-# Copyright 2018 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/>.
-
-# Check whether we can print an optimized-out vla.
-
-standard_testfile
-
-if { [prepare_for_testing "failed to prepare" $testfile "vla-optimized-out.c" \
- {debug optimize=-O3}] } {
- return -1
-}
-
-proc vla_optimized_out { } {
- if ![runto f1] {
- fail "can't run to f1"
- return
- }
-
- gdb_test "p a" \
- { = <optimized out>} \
- "printed optimized out vla"
-}
-
-vla_optimized_out
@@ -17,24 +17,43 @@
standard_testfile
-if { [prepare_for_testing "failed to prepare" $testfile $srcfile \
- {debug optimize=-O1 additional_flags=-DNOCLONE}] } {
- return -1
-}
+# The EXE_SUFFIX is a string appended to the name of the test binary
+# to make it unique per variation.
+# The OPTIONS is a two item list, the first item is a list of compiler
+# flags used for building the test binary, and the second item is a
+# pattern which matches some expected output within this proc.
+proc vla_optimized_out {exe_suffix options} {
+ global testfile srcfile
+
+ lassign $options compile_flags sizeof_result
+
+ if { [prepare_for_testing "failed to prepare" "$testfile-$exe_suffix" $srcfile \
+ $compile_flags] } {
+ return -1
+ }
-proc vla_optimized_out { } {
if ![runto f1] {
fail "can't run to f1"
return
}
gdb_test "p a" \
- { = <optimized out>} \
+ " = <optimized out>" \
"printed optimized out vla"
gdb_test "p sizeof (a)" \
- { = 6} \
+ " = $sizeof_result" \
"printed size of optimized out vla"
}
-vla_optimized_out
+foreach {test_prefix options} \
+ { "o1" {{debug optimize=-O1 additional_flags=-DNOCLONE} "6"} \
+ "o3" {{debug optimize=-O3} "<optimized out>"} \
+ "o3_strict" {{debug optimize=-O3 \
+ additional_flags=-gstrict-dwarf} \
+ "<optimized out>"}} {
+ with_test_prefix $test_prefix {
+ vla_optimized_out $test_prefix $options
+ }
+}
+