From patchwork Tue Aug 12 13:11:43 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yao Qi X-Patchwork-Id: 2371 Received: (qmail 31393 invoked by alias); 12 Aug 2014 13:15:54 -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 31326 invoked by uid 89); 12 Aug 2014 13:15:51 -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; Tue, 12 Aug 2014 13:15:47 +0000 Received: from svr-orw-exc-10.mgc.mentorg.com ([147.34.98.58]) by relay1.mentorg.com with esmtp id 1XHBvU-0000ZX-5Y from Yao_Qi@mentor.com for gdb-patches@sourceware.org; Tue, 12 Aug 2014 06:15:44 -0700 Received: from SVR-ORW-FEM-05.mgc.mentorg.com ([147.34.97.43]) by SVR-ORW-EXC-10.mgc.mentorg.com with Microsoft SMTPSVC(6.0.3790.4675); Tue, 12 Aug 2014 06:15:44 -0700 Received: from localhost.localdomain (147.34.91.1) by svr-orw-fem-05.mgc.mentorg.com (147.34.97.43) with Microsoft SMTP Server id 14.2.247.3; Tue, 12 Aug 2014 06:15:43 -0700 From: Yao Qi To: Subject: [PATCH] Copy .py files to remote host Date: Tue, 12 Aug 2014 21:11:43 +0800 Message-ID: <1407849103-16521-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-12 Yao Qi * gdb.python/py-finish-breakpoint.exp: Copy .py file to host. Delete the .py file on host when test is finished. * 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 | 15 ++++++++++++--- gdb/testsuite/gdb.python/py-finish-breakpoint2.exp | 6 +++++- gdb/testsuite/gdb.python/python.exp | 13 +++++++++++-- 3 files changed, 28 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..45aa231 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" @@ -115,6 +115,7 @@ gdb_test "source $python_file" "Python script imported.*" \ set cond_line [gdb_get_line_number "Condition Break."] if ![runto_main] then { + remote_file host delete ${python_file} fail "Cannot run to main." return 0 } @@ -141,6 +142,7 @@ gdb_test "source $python_file" "Python script imported.*" \ "import python scripts" if ![runto call_longjmp_1] then { + remote_file host delete ${python_file} perror "couldn't run to breakpoint call_longjmp" continue } @@ -168,6 +170,7 @@ gdb_test "source $python_file" "Python script imported.*" \ if ![runto_main] then { + remote_file host delete ${python_file} fail "Cannot run to main." return 0 } @@ -193,6 +196,7 @@ gdb_test "source $python_file" "Python script imported.*" \ "import python scripts" if ![runto_main] then { + remote_file host delete ${python_file} fail "Cannot run to main." return 0 } @@ -220,6 +224,7 @@ gdb_test "source $python_file" "Python script imported.*" \ "import python scripts" if ![runto_main] then { + remote_file host delete ${python_file} fail "Cannot run to main." return 0 } @@ -247,6 +252,7 @@ gdb_test "print increase(&i)" \ # if ![runto "test_exec_exit"] then { + remote_file host delete ${python_file} fail "Cannot run to test_exec_exit." return 0 } @@ -260,6 +266,7 @@ gdb_test "continue" "SimpleFinishBreakpoint out of scope.*" "catch out of scope # if ![runto "test_exec_exit"] then { + remote_file host delete ${python_file} fail "Cannot run to test_exec_exit." return 0 } @@ -267,3 +274,5 @@ if ![runto "test_exec_exit"] then { gdb_test "python SimpleFinishBreakpoint(gdb.newest_frame())" "SimpleFinishBreakpoint init" "set FinishBP after the exec" gdb_test "catch exec" "Catchpoint.*\(exec\).*" "catch exec" gdb_test "continue" "SimpleFinishBreakpoint out of scope.*" "catch out of scope after exec" + +remote_file host delete ${python_file} diff --git a/gdb/testsuite/gdb.python/py-finish-breakpoint2.exp b/gdb/testsuite/gdb.python/py-finish-breakpoint2.exp index 95f55b7..eb2f528 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 # @@ -53,3 +55,5 @@ gdb_test "python print (len(gdb.breakpoints()))" "3" "check finish BP removal" gdb_test "continue" ".*Breakpoint.* throw_exception_1.*" "continue to second exception" gdb_test "python ExceptionFinishBreakpoint(gdb.newest_frame())" "init ExceptionFinishBreakpoint" "set FinishBP after the exception" gdb_test "continue" ".*exception did not finish.*" "FinishBreakpoint with exception thrown not caught" + +remote_file host delete ${pyfile} diff --git a/gdb/testsuite/gdb.python/python.exp b/gdb/testsuite/gdb.python/python.exp index c03c284..85d0314 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" @@ -48,6 +51,7 @@ gdb_test_multiple "python print (23)" "verify python support" { "print (23)" "" \ "end" "not supported.*" + remote_file host delete ${remote_source2_py} return -1 } -re "$gdb_prompt $" {} @@ -73,7 +77,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" @@ -171,6 +175,7 @@ clean_restart ${testfile} # The following tests require execution. if ![runto_main] then { + remote_file host delete ${remote_source2_py} fail "Can't run to main" return 0 } @@ -333,6 +338,7 @@ clean_restart ${testfile} # The following tests require execution. if ![runto_main] then { + remote_file host delete ${remote_source2_py} fail "Can't run to main" return 0 } @@ -389,6 +395,7 @@ clean_restart ${testfile} # The following tests require execution. if ![runto_main] then { + remote_file host delete ${remote_source2_py} fail "Can't run to main" return 0 } @@ -402,3 +409,5 @@ gdb_py_test_silent_cmd "step" "Step into func2" 1 gdb_py_test_silent_cmd "up" "Step out of func2" 1 gdb_test "python print (gdb.find_pc_line(gdb.selected_frame().pc()).line > line)" "True" "Test find_pc_line with resume address" + +remote_file host delete ${remote_source2_py}