From patchwork Fri Aug 15 03:59:44 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yao Qi X-Patchwork-Id: 2399 Received: (qmail 7511 invoked by alias); 15 Aug 2014 04:04:08 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 7428 invoked by uid 89); 15 Aug 2014 04:04:07 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.7 required=5.0 tests=AWL, BAYES_00 autolearn=ham version=3.3.2 X-HELO: relay1.mentorg.com Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 15 Aug 2014 04:04:06 +0000 Received: from svr-orw-fem-01.mgc.mentorg.com ([147.34.98.93]) by relay1.mentorg.com with esmtp id 1XI8kE-0005XK-KJ from Yao_Qi@mentor.com for gdb-patches@sourceware.org; Thu, 14 Aug 2014 21:04:02 -0700 Received: from SVR-ORW-FEM-06.mgc.mentorg.com ([147.34.97.120]) by svr-orw-fem-01.mgc.mentorg.com over TLS secured channel with Microsoft SMTPSVC(6.0.3790.4675); Thu, 14 Aug 2014 21:04:02 -0700 Received: from qiyao.dyndns.org.com (147.34.91.1) by SVR-ORW-FEM-06.mgc.mentorg.com (147.34.97.120) with Microsoft SMTP Server id 14.2.247.3; Thu, 14 Aug 2014 21:04:01 -0700 From: Yao Qi To: Subject: [PATCH 3/3] Copy .py files to remote host Date: Fri, 15 Aug 2014 11:59:44 +0800 Message-ID: <1408075184-25947-4-git-send-email-yao@codesourcery.com> In-Reply-To: <1408075184-25947-1-git-send-email-yao@codesourcery.com> References: <1408075184-25947-1-git-send-email-yao@codesourcery.com> MIME-Version: 1.0 X-IsSubscribed: yes Some gdb.python/*.exp tests fail because the .py files aren't copied to the (remote) host. This patch is to copy needed .py files to host. Most of gdb.python/*.exp tests do this. gdb/testsuite: 2014-08-14 Yao Qi * gdb.python/py-finish-breakpoint.exp: Copy .py file to host. * gdb.python/py-finish-breakpoint2.exp: Likewise. * gdb.python/python.exp: Likewise. Use .py file on the host instead of the build. --- gdb/testsuite/gdb.python/py-finish-breakpoint.exp | 6 +++--- gdb/testsuite/gdb.python/py-finish-breakpoint2.exp | 4 +++- gdb/testsuite/gdb.python/python.exp | 7 +++++-- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/gdb/testsuite/gdb.python/py-finish-breakpoint.exp b/gdb/testsuite/gdb.python/py-finish-breakpoint.exp index 43d0d81..b30dccc 100644 --- a/gdb/testsuite/gdb.python/py-finish-breakpoint.exp +++ b/gdb/testsuite/gdb.python/py-finish-breakpoint.exp @@ -53,9 +53,6 @@ if { $gdb_py_is_py24 == 1 } { return 0 } -set python_file ${srcdir}/${subdir}/${testfile}.py - - # Skip all tests if Python scripting is not enabled. if { [skip_python_tests] } { continue } @@ -71,6 +68,9 @@ if ![runto_main] then { return 0 } +set python_file [gdb_remote_download host \ + ${srcdir}/${subdir}/${testfile}.py] + gdb_test_no_output "set confirm off" "disable confirmation" gdb_test "source $python_file" "Python script imported.*" \ "import python scripts" diff --git a/gdb/testsuite/gdb.python/py-finish-breakpoint2.exp b/gdb/testsuite/gdb.python/py-finish-breakpoint2.exp index 95f55b7..203fc99 100644 --- a/gdb/testsuite/gdb.python/py-finish-breakpoint2.exp +++ b/gdb/testsuite/gdb.python/py-finish-breakpoint2.exp @@ -19,7 +19,6 @@ load_lib gdb-python.exp standard_testfile .cc -set pyfile ${srcdir}/${subdir}/${testfile}.py if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} { return -1 @@ -33,6 +32,9 @@ if ![runto_main] then { return 0 } +set pyfile [gdb_remote_download host \ + ${srcdir}/${subdir}/${testfile}.py] + # # Check FinishBreakpoints against C++ exceptions # diff --git a/gdb/testsuite/gdb.python/python.exp b/gdb/testsuite/gdb.python/python.exp index c03c284..49f6e88 100644 --- a/gdb/testsuite/gdb.python/python.exp +++ b/gdb/testsuite/gdb.python/python.exp @@ -30,6 +30,9 @@ gdb_exit gdb_start gdb_reinitialize_dir $srcdir/$subdir +set remote_source2_py [gdb_remote_download host \ + ${srcdir}/${subdir}/source2.py] + # Do this instead of the skip_python_check. # We want to do some tests when Python is not present. gdb_test_multiple "python print (23)" "verify python support" { @@ -38,7 +41,7 @@ gdb_test_multiple "python print (23)" "verify python support" { # If Python is not supported, verify that sourcing a python script # causes an error. - gdb_test "source $srcdir/$subdir/source2.py" \ + gdb_test "source $remote_source2_py" \ "Error in sourced command file:.*" \ "source source2.py when python disabled" @@ -73,7 +76,7 @@ gdb_py_test_multiple "indented multi-line python command" \ "foo ()" "" \ "end" "hello, world!" -gdb_test "source $srcdir/$subdir/source2.py" "yes" "source source2.py" +gdb_test "source $remote_source2_py" "yes" "source source2.py" gdb_test "source -s source2.py" "yes" "source -s source2.py"