aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYao Qi <yao@codesourcery.com>2014-09-29 21:37:32 +0800
committerYao Qi <yao@codesourcery.com>2014-10-20 13:34:33 +0800
commit092f880b8e4cacee96e85a885c206e8879e86fec (patch)
tree5bf755354791bb5fea498e9c54080d2dd0f9c00b
parentacbdb7f355f9dfa851dcff3154944a0d96771b0e (diff)
downloadgdb-092f880b8e4cacee96e85a885c206e8879e86fec.zip
gdb-092f880b8e4cacee96e85a885c206e8879e86fec.tar.gz
gdb-092f880b8e4cacee96e85a885c206e8879e86fec.tar.bz2
Rename py-objfile-script-gdb.py.in to py-objfile-script-gdb.py
Patch <https://sourceware.org/ml/gdb-patches/2011-07/msg00225.html> 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 <yao@codesourcery.com> * 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.
-rw-r--r--gdb/testsuite/ChangeLog8
-rw-r--r--gdb/testsuite/gdb.python/py-objfile-script-gdb.py (renamed from gdb/testsuite/gdb.python/py-objfile-script-gdb.py.in)0
-rw-r--r--gdb/testsuite/gdb.python/py-objfile-script.exp5
3 files changed, 10 insertions, 3 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index a0bb480..3b7bb46 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,5 +1,13 @@
2014-10-20 Yao Qi <yao@codesourcery.com>
+ * 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 <yao@codesourcery.com>
+
* gdb.base/checkpoint.exp: Don't remove file copied on host.
* gdb.base/step-line.exp: Likewise.
* gdb.dwarf2/dw2-anonymous-func.exp: Likewise.
diff --git a/gdb/testsuite/gdb.python/py-objfile-script-gdb.py.in b/gdb/testsuite/gdb.python/py-objfile-script-gdb.py
index 5910bdb..5910bdb 100644
--- a/gdb/testsuite/gdb.python/py-objfile-script-gdb.py.in
+++ b/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 298bc3e..a844163 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"