From: Tom de Vries Date: Fri, 15 May 2020 12:49:48 +0000 (+0200) Subject: [gdb/testsuite] Rename *.exp.in to *.exp.tcl X-Git-Tag: binutils-2_35~750 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6dbc505a74ac6bb930a4b7306e60ea3a439bb886;p=thirdparty%2Fbinutils-gdb.git [gdb/testsuite] Rename *.exp.in to *.exp.tcl Say we have some common tcl code that we want to include in test-cases t1.exp and t1.exp. We could put the common code into a file common.exp alongside the test-cases, but that will make dejagnu treat that file as another test-case. To prevent this, we use a suffix, currently .in, in other words we put the common code in a file common.exp.in. The .in suffix however is also used in autoconf, which might cause confusion. Change the suffix from .in to .tcl. gdb/testsuite/ChangeLog: 2020-05-15 Tom de Vries * gdb.base/align.exp.in: Rename to ... * gdb.base/align.exp.tcl: ... this. * gdb.base/align-c++.exp: Update. * gdb.base/align-c.exp: Update. * gdb.base/all-architectures.exp.in: Rename to ... * gdb.base/all-architectures.exp: ... this. * gdb.base/all-architectures-0.exp: Update. * gdb.base/all-architectures-1.exp: Update. * gdb.base/all-architectures-2.exp: Update. * gdb.base/all-architectures-3.exp: Update. * gdb.base/all-architectures-4.exp: Update. * gdb.base/all-architectures-5.exp: Update. * gdb.base/all-architectures-6.exp: Update. * gdb.base/all-architectures-7.exp: Update. * gdb.base/infcall-nested-structs.exp.in: Rename to ... * gdb.base/infcall-nested-structs.exp.tcl: ... this. * gdb.base/infcall-nested-structs-c++.exp: Update. * gdb.base/infcall-nested-structs-c.exp: Update. * gdb.base/info-types.exp.in: Rename to ... * gdb.base/info-types.exp.tcl: ... this. * gdb.base/info-types-c++.exp: Update. * gdb.base/info-types-c.exp: Update. * gdb.base/max-depth.exp.in: Rename to ... * gdb.base/max-depth.exp.tcl: ... this. * gdb.base/max-depth-c++.exp: Update. * gdb.base/max-depth-c.exp: Update. * gdb.cp/cpexprs.exp.in: Rename to ... * gdb.cp/cpexprs.exp.tcl: ... this. * gdb.cp/cpexprs-debug-types.exp: Update. * gdb.cp/cpexprs.exp: Update. * gdb.cp/infcall-nodebug.exp.in: Rename to ... * gdb.cp/infcall-nodebug.exp.tcl: ... this. * gdb.cp/infcall-nodebug-c++-d0.exp: Update. * gdb.cp/infcall-nodebug-c++-d1.exp: Update. * gdb.cp/infcall-nodebug-c-d0.exp: Update. * gdb.cp/infcall-nodebug-c-d1.exp: Update. * gdb.dwarf2/clang-debug-names.exp.in: Rename to ... * gdb.dwarf2/clang-debug-names.exp.tcl: ... this. * gdb.dwarf2/clang-debug-names-2.exp: Update. * gdb.dwarf2/clang-debug-names.exp: Update. --- diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 5a523c2d2bc..30a150d782c 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,46 @@ +2020-05-15 Tom de Vries + + * gdb.base/align.exp.in: Rename to ... + * gdb.base/align.exp.tcl: ... this. + * gdb.base/align-c++.exp: Update. + * gdb.base/align-c.exp: Update. + * gdb.base/all-architectures.exp.in: Rename to ... + * gdb.base/all-architectures.exp: ... this. + * gdb.base/all-architectures-0.exp: Update. + * gdb.base/all-architectures-1.exp: Update. + * gdb.base/all-architectures-2.exp: Update. + * gdb.base/all-architectures-3.exp: Update. + * gdb.base/all-architectures-4.exp: Update. + * gdb.base/all-architectures-5.exp: Update. + * gdb.base/all-architectures-6.exp: Update. + * gdb.base/all-architectures-7.exp: Update. + * gdb.base/infcall-nested-structs.exp.in: Rename to ... + * gdb.base/infcall-nested-structs.exp.tcl: ... this. + * gdb.base/infcall-nested-structs-c++.exp: Update. + * gdb.base/infcall-nested-structs-c.exp: Update. + * gdb.base/info-types.exp.in: Rename to ... + * gdb.base/info-types.exp.tcl: ... this. + * gdb.base/info-types-c++.exp: Update. + * gdb.base/info-types-c.exp: Update. + * gdb.base/max-depth.exp.in: Rename to ... + * gdb.base/max-depth.exp.tcl: ... this. + * gdb.base/max-depth-c++.exp: Update. + * gdb.base/max-depth-c.exp: Update. + * gdb.cp/cpexprs.exp.in: Rename to ... + * gdb.cp/cpexprs.exp.tcl: ... this. + * gdb.cp/cpexprs-debug-types.exp: Update. + * gdb.cp/cpexprs.exp: Update. + * gdb.cp/infcall-nodebug.exp.in: Rename to ... + * gdb.cp/infcall-nodebug.exp.tcl: ... this. + * gdb.cp/infcall-nodebug-c++-d0.exp: Update. + * gdb.cp/infcall-nodebug-c++-d1.exp: Update. + * gdb.cp/infcall-nodebug-c-d0.exp: Update. + * gdb.cp/infcall-nodebug-c-d1.exp: Update. + * gdb.dwarf2/clang-debug-names.exp.in: Rename to ... + * gdb.dwarf2/clang-debug-names.exp.tcl: ... this. + * gdb.dwarf2/clang-debug-names-2.exp: Update. + * gdb.dwarf2/clang-debug-names.exp: Update. + 2020-05-15 Andrew Burgess * lib/check-test-names.exp: Remove code that prevents this file diff --git a/gdb/testsuite/gdb.base/align-c++.exp b/gdb/testsuite/gdb.base/align-c++.exp index 09632d8bfaa..6266d112828 100644 --- a/gdb/testsuite/gdb.base/align-c++.exp +++ b/gdb/testsuite/gdb.base/align-c++.exp @@ -24,4 +24,4 @@ if { [skip_cplus_tests] || [get_compiler_info "c++"] } { } set lang c++ -source $srcdir/$subdir/align.exp.in +source $srcdir/$subdir/align.exp.tcl diff --git a/gdb/testsuite/gdb.base/align-c.exp b/gdb/testsuite/gdb.base/align-c.exp index d7852f4ea83..d42abc8d380 100644 --- a/gdb/testsuite/gdb.base/align-c.exp +++ b/gdb/testsuite/gdb.base/align-c.exp @@ -20,4 +20,4 @@ set lang c -source $srcdir/$subdir/align.exp.in +source $srcdir/$subdir/align.exp.tcl diff --git a/gdb/testsuite/gdb.base/align.exp.in b/gdb/testsuite/gdb.base/align.exp.tcl similarity index 100% rename from gdb/testsuite/gdb.base/align.exp.in rename to gdb/testsuite/gdb.base/align.exp.tcl diff --git a/gdb/testsuite/gdb.base/all-architectures-0.exp b/gdb/testsuite/gdb.base/all-architectures-0.exp index 767daac9fff..d861c41aff5 100644 --- a/gdb/testsuite/gdb.base/all-architectures-0.exp +++ b/gdb/testsuite/gdb.base/all-architectures-0.exp @@ -14,4 +14,4 @@ # along with this program. If not, see . */ set test_slice 0 -source $srcdir/$subdir/all-architectures.exp.in +source $srcdir/$subdir/all-architectures.exp.tcl diff --git a/gdb/testsuite/gdb.base/all-architectures-1.exp b/gdb/testsuite/gdb.base/all-architectures-1.exp index 91aad9dc861..0e6379eea5d 100644 --- a/gdb/testsuite/gdb.base/all-architectures-1.exp +++ b/gdb/testsuite/gdb.base/all-architectures-1.exp @@ -14,4 +14,4 @@ # along with this program. If not, see . */ set test_slice 1 -source $srcdir/$subdir/all-architectures.exp.in +source $srcdir/$subdir/all-architectures.exp.tcl diff --git a/gdb/testsuite/gdb.base/all-architectures-2.exp b/gdb/testsuite/gdb.base/all-architectures-2.exp index c24a332bc24..6216d48a7c6 100644 --- a/gdb/testsuite/gdb.base/all-architectures-2.exp +++ b/gdb/testsuite/gdb.base/all-architectures-2.exp @@ -14,4 +14,4 @@ # along with this program. If not, see . */ set test_slice 2 -source $srcdir/$subdir/all-architectures.exp.in +source $srcdir/$subdir/all-architectures.exp.tcl diff --git a/gdb/testsuite/gdb.base/all-architectures-3.exp b/gdb/testsuite/gdb.base/all-architectures-3.exp index a88a38b3a97..bd873a9666c 100644 --- a/gdb/testsuite/gdb.base/all-architectures-3.exp +++ b/gdb/testsuite/gdb.base/all-architectures-3.exp @@ -14,4 +14,4 @@ # along with this program. If not, see . */ set test_slice 3 -source $srcdir/$subdir/all-architectures.exp.in +source $srcdir/$subdir/all-architectures.exp.tcl diff --git a/gdb/testsuite/gdb.base/all-architectures-4.exp b/gdb/testsuite/gdb.base/all-architectures-4.exp index f6c9fc4cefa..17b0160036b 100644 --- a/gdb/testsuite/gdb.base/all-architectures-4.exp +++ b/gdb/testsuite/gdb.base/all-architectures-4.exp @@ -14,4 +14,4 @@ # along with this program. If not, see . */ set test_slice 4 -source $srcdir/$subdir/all-architectures.exp.in +source $srcdir/$subdir/all-architectures.exp.tcl diff --git a/gdb/testsuite/gdb.base/all-architectures-5.exp b/gdb/testsuite/gdb.base/all-architectures-5.exp index e84441be4a8..613ae6fdf12 100644 --- a/gdb/testsuite/gdb.base/all-architectures-5.exp +++ b/gdb/testsuite/gdb.base/all-architectures-5.exp @@ -14,4 +14,4 @@ # along with this program. If not, see . */ set test_slice 5 -source $srcdir/$subdir/all-architectures.exp.in +source $srcdir/$subdir/all-architectures.exp.tcl diff --git a/gdb/testsuite/gdb.base/all-architectures-6.exp b/gdb/testsuite/gdb.base/all-architectures-6.exp index 702b5237d2f..3dceb5e1f83 100644 --- a/gdb/testsuite/gdb.base/all-architectures-6.exp +++ b/gdb/testsuite/gdb.base/all-architectures-6.exp @@ -14,4 +14,4 @@ # along with this program. If not, see . */ set test_slice 6 -source $srcdir/$subdir/all-architectures.exp.in +source $srcdir/$subdir/all-architectures.exp.tcl diff --git a/gdb/testsuite/gdb.base/all-architectures-7.exp b/gdb/testsuite/gdb.base/all-architectures-7.exp index 2d0705b384b..ba7640ce44c 100644 --- a/gdb/testsuite/gdb.base/all-architectures-7.exp +++ b/gdb/testsuite/gdb.base/all-architectures-7.exp @@ -14,4 +14,4 @@ # along with this program. If not, see . */ set test_slice 7 -source $srcdir/$subdir/all-architectures.exp.in +source $srcdir/$subdir/all-architectures.exp.tcl diff --git a/gdb/testsuite/gdb.base/all-architectures.exp.in b/gdb/testsuite/gdb.base/all-architectures.exp.tcl similarity index 100% rename from gdb/testsuite/gdb.base/all-architectures.exp.in rename to gdb/testsuite/gdb.base/all-architectures.exp.tcl diff --git a/gdb/testsuite/gdb.base/infcall-nested-structs-c++.exp b/gdb/testsuite/gdb.base/infcall-nested-structs-c++.exp index 9da0621384e..4741e0dade4 100644 --- a/gdb/testsuite/gdb.base/infcall-nested-structs-c++.exp +++ b/gdb/testsuite/gdb.base/infcall-nested-structs-c++.exp @@ -21,4 +21,4 @@ if { [skip_cplus_tests] || [get_compiler_info "c++"] } { } set lang c++ -source $srcdir/$subdir/infcall-nested-structs.exp.in +source $srcdir/$subdir/infcall-nested-structs.exp.tcl diff --git a/gdb/testsuite/gdb.base/infcall-nested-structs-c.exp b/gdb/testsuite/gdb.base/infcall-nested-structs-c.exp index a715c5bd0d2..1e876e331a4 100644 --- a/gdb/testsuite/gdb.base/infcall-nested-structs-c.exp +++ b/gdb/testsuite/gdb.base/infcall-nested-structs-c.exp @@ -17,4 +17,4 @@ set lang {c} -source $srcdir/$subdir/infcall-nested-structs.exp.in +source $srcdir/$subdir/infcall-nested-structs.exp.tcl diff --git a/gdb/testsuite/gdb.base/infcall-nested-structs.exp.in b/gdb/testsuite/gdb.base/infcall-nested-structs.exp.tcl similarity index 100% rename from gdb/testsuite/gdb.base/infcall-nested-structs.exp.in rename to gdb/testsuite/gdb.base/infcall-nested-structs.exp.tcl diff --git a/gdb/testsuite/gdb.base/info-types-c++.exp b/gdb/testsuite/gdb.base/info-types-c++.exp index 4f44369fe98..587a39f55fe 100644 --- a/gdb/testsuite/gdb.base/info-types-c++.exp +++ b/gdb/testsuite/gdb.base/info-types-c++.exp @@ -19,4 +19,4 @@ if { [skip_cplus_tests] || [get_compiler_info "c++"] } { } set lang c++ -source $srcdir/$subdir/info-types.exp.in +source $srcdir/$subdir/info-types.exp.tcl diff --git a/gdb/testsuite/gdb.base/info-types-c.exp b/gdb/testsuite/gdb.base/info-types-c.exp index 800d6389a4b..0b6e81d5b2b 100644 --- a/gdb/testsuite/gdb.base/info-types-c.exp +++ b/gdb/testsuite/gdb.base/info-types-c.exp @@ -15,4 +15,4 @@ set lang {c} -source $srcdir/$subdir/info-types.exp.in +source $srcdir/$subdir/info-types.exp.tcl diff --git a/gdb/testsuite/gdb.base/info-types.exp.in b/gdb/testsuite/gdb.base/info-types.exp.tcl similarity index 100% rename from gdb/testsuite/gdb.base/info-types.exp.in rename to gdb/testsuite/gdb.base/info-types.exp.tcl diff --git a/gdb/testsuite/gdb.base/max-depth-c++.exp b/gdb/testsuite/gdb.base/max-depth-c++.exp index b88b2c118d8..9f732d004fc 100644 --- a/gdb/testsuite/gdb.base/max-depth-c++.exp +++ b/gdb/testsuite/gdb.base/max-depth-c++.exp @@ -19,4 +19,4 @@ if { [skip_cplus_tests] || [get_compiler_info "c++"] } { } set lang c++ -source $srcdir/$subdir/max-depth.exp.in +source $srcdir/$subdir/max-depth.exp.tcl diff --git a/gdb/testsuite/gdb.base/max-depth-c.exp b/gdb/testsuite/gdb.base/max-depth-c.exp index 3bd93098d2c..765772087d6 100644 --- a/gdb/testsuite/gdb.base/max-depth-c.exp +++ b/gdb/testsuite/gdb.base/max-depth-c.exp @@ -15,4 +15,4 @@ set lang {c} -source $srcdir/$subdir/max-depth.exp.in +source $srcdir/$subdir/max-depth.exp.tcl diff --git a/gdb/testsuite/gdb.base/max-depth.exp.in b/gdb/testsuite/gdb.base/max-depth.exp.tcl similarity index 100% rename from gdb/testsuite/gdb.base/max-depth.exp.in rename to gdb/testsuite/gdb.base/max-depth.exp.tcl diff --git a/gdb/testsuite/gdb.cp/cpexprs-debug-types.exp b/gdb/testsuite/gdb.cp/cpexprs-debug-types.exp index b93f2e8c157..ece7bc9acdd 100644 --- a/gdb/testsuite/gdb.cp/cpexprs-debug-types.exp +++ b/gdb/testsuite/gdb.cp/cpexprs-debug-types.exp @@ -17,4 +17,4 @@ # Run cpexprs.exp with -fdebug-types-section. set flags {additional_flags=-fdebug-types-section} -source $srcdir/$subdir/cpexprs.exp.in +source $srcdir/$subdir/cpexprs.exp.tcl diff --git a/gdb/testsuite/gdb.cp/cpexprs.exp b/gdb/testsuite/gdb.cp/cpexprs.exp index b16a5ea6e38..62f13a38e82 100644 --- a/gdb/testsuite/gdb.cp/cpexprs.exp +++ b/gdb/testsuite/gdb.cp/cpexprs.exp @@ -21,4 +21,4 @@ # Run cpexprs.exp. set flags {} -source $srcdir/$subdir/cpexprs.exp.in +source $srcdir/$subdir/cpexprs.exp.tcl diff --git a/gdb/testsuite/gdb.cp/cpexprs.exp.in b/gdb/testsuite/gdb.cp/cpexprs.exp.tcl similarity index 100% rename from gdb/testsuite/gdb.cp/cpexprs.exp.in rename to gdb/testsuite/gdb.cp/cpexprs.exp.tcl diff --git a/gdb/testsuite/gdb.cp/infcall-nodebug-c++-d0.exp b/gdb/testsuite/gdb.cp/infcall-nodebug-c++-d0.exp index f06ab086288..806d03b0e2c 100644 --- a/gdb/testsuite/gdb.cp/infcall-nodebug-c++-d0.exp +++ b/gdb/testsuite/gdb.cp/infcall-nodebug-c++-d0.exp @@ -22,4 +22,4 @@ set lang {c++} set debug nodebug -source $srcdir/$subdir/infcall-nodebug.exp.in +source $srcdir/$subdir/infcall-nodebug.exp.tcl diff --git a/gdb/testsuite/gdb.cp/infcall-nodebug-c++-d1.exp b/gdb/testsuite/gdb.cp/infcall-nodebug-c++-d1.exp index d9dd14faf96..dfafe52afb0 100644 --- a/gdb/testsuite/gdb.cp/infcall-nodebug-c++-d1.exp +++ b/gdb/testsuite/gdb.cp/infcall-nodebug-c++-d1.exp @@ -22,4 +22,4 @@ set lang {c++} set debug debug -source $srcdir/$subdir/infcall-nodebug.exp.in +source $srcdir/$subdir/infcall-nodebug.exp.tcl diff --git a/gdb/testsuite/gdb.cp/infcall-nodebug-c-d0.exp b/gdb/testsuite/gdb.cp/infcall-nodebug-c-d0.exp index cd65dd036a7..b74f9333f8b 100644 --- a/gdb/testsuite/gdb.cp/infcall-nodebug-c-d0.exp +++ b/gdb/testsuite/gdb.cp/infcall-nodebug-c-d0.exp @@ -18,4 +18,4 @@ set lang {c} set debug nodebug -source $srcdir/$subdir/infcall-nodebug.exp.in +source $srcdir/$subdir/infcall-nodebug.exp.tcl diff --git a/gdb/testsuite/gdb.cp/infcall-nodebug-c-d1.exp b/gdb/testsuite/gdb.cp/infcall-nodebug-c-d1.exp index 4cb26ad3fd2..b9d68637ae3 100644 --- a/gdb/testsuite/gdb.cp/infcall-nodebug-c-d1.exp +++ b/gdb/testsuite/gdb.cp/infcall-nodebug-c-d1.exp @@ -18,4 +18,4 @@ set lang {c} set debug debug -source $srcdir/$subdir/infcall-nodebug.exp.in +source $srcdir/$subdir/infcall-nodebug.exp.tcl diff --git a/gdb/testsuite/gdb.cp/infcall-nodebug.exp.in b/gdb/testsuite/gdb.cp/infcall-nodebug.exp.tcl similarity index 100% rename from gdb/testsuite/gdb.cp/infcall-nodebug.exp.in rename to gdb/testsuite/gdb.cp/infcall-nodebug.exp.tcl diff --git a/gdb/testsuite/gdb.dwarf2/clang-debug-names-2.exp b/gdb/testsuite/gdb.dwarf2/clang-debug-names-2.exp index 185dddfc733..43d7801c0d9 100644 --- a/gdb/testsuite/gdb.dwarf2/clang-debug-names-2.exp +++ b/gdb/testsuite/gdb.dwarf2/clang-debug-names-2.exp @@ -29,7 +29,7 @@ lassign \ main_start main_length set asm_file [standard_output_file $srcfile2] -source $srcdir/$subdir/clang-debug-names.exp.in +source $srcdir/$subdir/clang-debug-names.exp.tcl if { [build_executable_from_specs "failed to prepare" ${testfile} "" \ $srcfile "nodebug" $asm_file "nodebug" $srcfile3 "debug"] } { diff --git a/gdb/testsuite/gdb.dwarf2/clang-debug-names.exp b/gdb/testsuite/gdb.dwarf2/clang-debug-names.exp index b5af898838f..149c1263c90 100644 --- a/gdb/testsuite/gdb.dwarf2/clang-debug-names.exp +++ b/gdb/testsuite/gdb.dwarf2/clang-debug-names.exp @@ -26,7 +26,7 @@ lassign [function_range main ${srcdir}/${subdir}/${srcfile}] \ main_start main_length set asm_file [standard_output_file $srcfile2] -source $srcdir/$subdir/clang-debug-names.exp.in +source $srcdir/$subdir/clang-debug-names.exp.tcl if { [prepare_for_testing "failed to prepare" ${testfile} \ [list $srcfile $asm_file] {nodebug}] } { diff --git a/gdb/testsuite/gdb.dwarf2/clang-debug-names.exp.in b/gdb/testsuite/gdb.dwarf2/clang-debug-names.exp.tcl similarity index 100% rename from gdb/testsuite/gdb.dwarf2/clang-debug-names.exp.in rename to gdb/testsuite/gdb.dwarf2/clang-debug-names.exp.tcl