From 092f880b8e4cacee96e85a885c206e8879e86fec Mon Sep 17 00:00:00 2001 From: Yao Qi Date: Mon, 29 Sep 2014 21:37:32 +0800 Subject: [PATCH] Rename py-objfile-script-gdb.py.in to py-objfile-script-gdb.py Patch was to fix the problem that py-objfile-script-gdb.py is removed after an in-tree build and test. As a result of the previous patch (we don't remove files copied to host any more), this patch is no longer needed. This patch is to revert it logically. gdb/testsuite: 2014-10-20 Yao Qi * gdb.python/py-objfile-script-gdb.py.in: Rename it to ... * gdb.python/py-objfile-script-gdb.py: New file. * gdb.python/py-objfile-script.exp: Update reference to py-objfile-script-gdb.py.in. Use gdb_remote_donwload instead of remote_download. Remove the dest file. --- gdb/testsuite/ChangeLog | 8 ++++++++ ...-objfile-script-gdb.py.in => py-objfile-script-gdb.py} | 0 gdb/testsuite/gdb.python/py-objfile-script.exp | 5 ++--- 3 files changed, 10 insertions(+), 3 deletions(-) rename gdb/testsuite/gdb.python/{py-objfile-script-gdb.py.in => py-objfile-script-gdb.py} (100%) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index a0bb480776c..3b7bb46e531 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,11 @@ +2014-10-20 Yao Qi + + * gdb.python/py-objfile-script-gdb.py.in: Rename it to ... + * gdb.python/py-objfile-script-gdb.py: New file. + * gdb.python/py-objfile-script.exp: Update reference to + py-objfile-script-gdb.py.in. Use gdb_remote_donwload instead + of remote_download. Remove the dest file. + 2014-10-20 Yao Qi * gdb.base/checkpoint.exp: Don't remove file copied on host. diff --git a/gdb/testsuite/gdb.python/py-objfile-script-gdb.py.in b/gdb/testsuite/gdb.python/py-objfile-script-gdb.py similarity index 100% rename from gdb/testsuite/gdb.python/py-objfile-script-gdb.py.in rename to gdb/testsuite/gdb.python/py-objfile-script-gdb.py diff --git a/gdb/testsuite/gdb.python/py-objfile-script.exp b/gdb/testsuite/gdb.python/py-objfile-script.exp index 298bc3e42ea..a844163873a 100644 --- a/gdb/testsuite/gdb.python/py-objfile-script.exp +++ b/gdb/testsuite/gdb.python/py-objfile-script.exp @@ -32,9 +32,8 @@ if { [skip_python_tests] } { continue } # Make the -gdb.py script available to gdb, it is automagically loaded by gdb. # Care is taken to put it in the same directory as the binary so that # gdb will find it. -set remote_python_file [remote_download host \ - ${srcdir}/${subdir}/${testfile}-gdb.py.in \ - [standard_output_file ${testfile}-gdb.py]] +set remote_python_file [gdb_remote_download host \ + ${srcdir}/${subdir}/${testfile}-gdb.py] gdb_reinitialize_dir $srcdir/$subdir gdb_test_no_output "set auto-load safe-path ${remote_python_file}" "set auto-load safe-path" -- 2.30.2