From 5277208d3291cf9e4ffae4ebd90b726998f3f6d4 Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Mon, 17 May 2021 14:58:26 -0400 Subject: [PATCH] gdb/testsuite: rename .py.in files to .py I noticed these files because they weren't considered by black for reformatting, prior to adding pyproject.toml, because their extension is not .py. I don't think they specifically need to be named .py.in, so I suggest renaming them to .py. This will make it nicer to edit them, as editors will recognize them more easily as Python files. Perhaps this was needed before, when the testsuite didn't always put output files in the output directory. Then, a different name for the source and destination file might have been desirable to avoid overwriting a file with itself (perhaps that wasn't well handled). But in any case, it doesn't see to cause any problem now. gdb/testsuite/ChangeLog: * gdb.python/py-framefilter-gdb.py.in: Rename to: * gdb.python/py-framefilter-gdb.py: ... this. * gdb.python/py-framefilter-invalidarg-gdb.py.in: Rename to: * gdb.python/py-framefilter-invalidarg-gdb.py: ... this. Change-Id: I63bb94010bbbc33434ee1c91a386c91fc1ff80bc --- gdb/testsuite/ChangeLog | 7 +++++++ .../{py-framefilter-gdb.py.in => py-framefilter-gdb.py} | 0 ...validarg-gdb.py.in => py-framefilter-invalidarg-gdb.py} | 0 gdb/testsuite/gdb.python/py-framefilter-invalidarg.exp | 2 +- gdb/testsuite/gdb.python/py-framefilter.exp | 4 ++-- 5 files changed, 10 insertions(+), 3 deletions(-) rename gdb/testsuite/gdb.python/{py-framefilter-gdb.py.in => py-framefilter-gdb.py} (100%) rename gdb/testsuite/gdb.python/{py-framefilter-invalidarg-gdb.py.in => py-framefilter-invalidarg-gdb.py} (100%) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 69d00ff8cea..95f5536c64b 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2021-05-17 Simon Marchi + + * gdb.python/py-framefilter-gdb.py.in: Rename to: + * gdb.python/py-framefilter-gdb.py: ... this. + * gdb.python/py-framefilter-invalidarg-gdb.py.in: Rename to: + * gdb.python/py-framefilter-invalidarg-gdb.py: ... this. + 2021-05-17 Simon Marchi * gdb.python/py-framefilter-gdb.py.in: Re-format. diff --git a/gdb/testsuite/gdb.python/py-framefilter-gdb.py.in b/gdb/testsuite/gdb.python/py-framefilter-gdb.py similarity index 100% rename from gdb/testsuite/gdb.python/py-framefilter-gdb.py.in rename to gdb/testsuite/gdb.python/py-framefilter-gdb.py diff --git a/gdb/testsuite/gdb.python/py-framefilter-invalidarg-gdb.py.in b/gdb/testsuite/gdb.python/py-framefilter-invalidarg-gdb.py similarity index 100% rename from gdb/testsuite/gdb.python/py-framefilter-invalidarg-gdb.py.in rename to gdb/testsuite/gdb.python/py-framefilter-invalidarg-gdb.py diff --git a/gdb/testsuite/gdb.python/py-framefilter-invalidarg.exp b/gdb/testsuite/gdb.python/py-framefilter-invalidarg.exp index 86f3056bbd8..58b06d87e72 100644 --- a/gdb/testsuite/gdb.python/py-framefilter-invalidarg.exp +++ b/gdb/testsuite/gdb.python/py-framefilter-invalidarg.exp @@ -40,7 +40,7 @@ if { [skip_python_tests] } { continue } # gdb will find it. set remote_obj_python_file \ [remote_download \ - host ${srcdir}/${subdir}/${testfile}-gdb.py.in \ + host ${srcdir}/${subdir}/${testfile}-gdb.py \ [standard_output_file ${testfile}-gdb.py]] gdb_reinitialize_dir $srcdir/$subdir diff --git a/gdb/testsuite/gdb.python/py-framefilter.exp b/gdb/testsuite/gdb.python/py-framefilter.exp index a9c6ca642be..7fbb4fcfec9 100644 --- a/gdb/testsuite/gdb.python/py-framefilter.exp +++ b/gdb/testsuite/gdb.python/py-framefilter.exp @@ -41,7 +41,7 @@ gdb_test "info frame-filter" \ # Care is taken to put it in the same directory as the binary so that # gdb will find it. set remote_obj_python_file \ - [gdb_remote_download host ${srcdir}/${subdir}/${testfile}-gdb.py.in \ + [gdb_remote_download host ${srcdir}/${subdir}/${testfile}-gdb.py \ ${testfile}-gdb.py] gdb_reinitialize_dir $srcdir/$subdir @@ -299,7 +299,7 @@ if { [skip_python_tests] } { continue } # Care is taken to put it in the same directory as the binary so that # gdb will find it. set remote_obj_python_file \ - [gdb_remote_download host ${srcdir}/${subdir}/${testfile}-gdb.py.in \ + [gdb_remote_download host ${srcdir}/${subdir}/${testfile}-gdb.py \ ${testfile}-gdb.py] gdb_reinitialize_dir $srcdir/$subdir -- 2.30.2