From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 92944 invoked by alias); 19 Jul 2017 11:28:16 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 92827 invoked by uid 89); 19 Jul 2017 11:28:15 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.4 required=5.0 tests=BAYES_00,FREEMAIL_FROM,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,RCVD_IN_DNSWL_NONE,RCVD_IN_SORBS_SPAM,SPF_PASS autolearn=ham version=3.3.2 spammy=9*, H*r:sk:static. X-HELO: mail-it0-f44.google.com Received: from mail-it0-f44.google.com (HELO mail-it0-f44.google.com) (209.85.214.44) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 19 Jul 2017 11:28:11 +0000 Received: by mail-it0-f44.google.com with SMTP id a62so35328404itd.1 for ; Wed, 19 Jul 2017 04:28:11 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=/6NReK4L4uP5OdxOejuOmg8VrL3/3Tr1c7DQFOJQ600=; b=muEX9sph71IVlDvP4EcbB5PAIi1oj+m3EDiKiSY1OFf/PBoEZwr7SsV+TpPbOMUDfE d/zBwQnTiiOzhSsfintefLCmNNimfrxj4+sqrf1LgVmeJy3GxVT0nToUQd31tCQuI2oh EaLwflE9b5ghHIG/yEs3V5qrg7f1BSW6fYx42SMMJwsN+pvg8eOIr2q5jUfL8dZF4Q+Z aI1JbcQTx47EXehApx3TjtNqAPU5rWsjdlmc3YdsANWM/Bxwl+YPMxql7YEjuK4bNgTY Hi7aDGZTrt31MR1sgv8RinBoZGtjQNGYOMSv//nE9jeGz63kbKrAiRFZOVxjplu27rfG ZDQQ== X-Gm-Message-State: AIVw112+lu2ExwAuhhjHf7aliMnJUKzwKGkaIrDQ1QKS9b9gMAiROZ0d 0p/4K4zgo+Cyhy3x X-Received: by 10.36.103.207 with SMTP id u198mr118979itc.27.1500463689636; Wed, 19 Jul 2017 04:28:09 -0700 (PDT) Received: from E107787-LIN.cambridge.arm.com (static.42.136.251.148.clients.your-server.de. [148.251.136.42]) by smtp.gmail.com with ESMTPSA id v96sm2593708ioi.50.2017.07.19.04.28.08 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 19 Jul 2017 04:28:09 -0700 (PDT) From: Yao Qi X-Google-Original-From: Yao Qi To: gdb-patches@sourceware.org Subject: [PATCH 2/2] Re-indent reread.exp Date: Wed, 19 Jul 2017 11:28:00 -0000 Message-Id: <1500463680-1483-2-git-send-email-yao.qi@linaro.org> In-Reply-To: <1500463680-1483-1-git-send-email-yao.qi@linaro.org> References: <1500463680-1483-1-git-send-email-yao.qi@linaro.org> X-IsSubscribed: yes X-SW-Source: 2017-07/txt/msg00287.txt.bz2 gdb/testsuite: 2017-07-18 Yao Qi * gdb.base/reread.exp: Re-indent the code. --- gdb/testsuite/gdb.base/reread.exp | 160 +++++++++++++++++++------------------- 1 file changed, 81 insertions(+), 79 deletions(-) diff --git a/gdb/testsuite/gdb.base/reread.exp b/gdb/testsuite/gdb.base/reread.exp index 74bd20e..6c7cd70 100644 --- a/gdb/testsuite/gdb.base/reread.exp +++ b/gdb/testsuite/gdb.base/reread.exp @@ -20,112 +20,114 @@ foreach_with_prefix opts { { "" "" } { "-fPIE" "ldflags=-pie" } } { -# build the first test case + # build the first test case -set testfile1 "reread1" -set srcfile1 ${testfile1}.c -# Cygwin needs $EXEEXT. -set binfile1 [standard_output_file ${testfile1}$EXEEXT] + set testfile1 "reread1" + set srcfile1 ${testfile1}.c + # Cygwin needs $EXEEXT. + set binfile1 [standard_output_file ${testfile1}$EXEEXT] -if { [gdb_compile "${srcdir}/${subdir}/${srcfile1}" "${binfile1}" executable [list debug nowarnings additional_flags=[lindex $opts 0] [lindex $opts 1]]] != "" } { - untested "failed to compile first testcase" - return -1 -} + if { [gdb_compile "${srcdir}/${subdir}/${srcfile1}" "${binfile1}" executable [list debug nowarnings additional_flags=[lindex $opts 0] [lindex $opts 1]]] != "" } { + untested "failed to compile first testcase" + return -1 + } -# build the second test case + # build the second test case -set testfile2 "reread2" -set srcfile2 ${testfile2}.c -set binfile2 [standard_output_file ${testfile2}$EXEEXT] + set testfile2 "reread2" + set srcfile2 ${testfile2}.c + set binfile2 [standard_output_file ${testfile2}$EXEEXT] -if { [gdb_compile "${srcdir}/${subdir}/${srcfile2}" "${binfile2}" executable [list debug nowarnings additional_flags=[lindex $opts 0] [lindex $opts 1]]] != "" - && [gdb_compile "${srcdir}/${subdir}/${srcfile2}" "${binfile2}" executable [list debug nowarnings "additional_flags=-DNO_SECTIONS [lindex $opts 0]" [lindex $opts 1]]] != ""} { - untested "failed to compile second testcase" - return -1 -} + if { [gdb_compile "${srcdir}/${subdir}/${srcfile2}" "${binfile2}" executable [list debug nowarnings additional_flags=[lindex $opts 0] [lindex $opts 1]]] != "" + && [gdb_compile "${srcdir}/${subdir}/${srcfile2}" "${binfile2}" executable [list debug nowarnings "additional_flags=-DNO_SECTIONS [lindex $opts 0]" [lindex $opts 1]]] != ""} { + untested "failed to compile second testcase" + return -1 + } -# Start with a fresh gdb. + # Start with a fresh gdb. -set testfile "reread" -set binfile [standard_output_file ${testfile}$EXEEXT] + set testfile "reread" + set binfile [standard_output_file ${testfile}$EXEEXT] -gdb_start -gdb_reinitialize_dir $srcdir/$subdir + gdb_start + gdb_reinitialize_dir $srcdir/$subdir -# Load the first executable. + # Load the first executable. -gdb_rename_execfile ${binfile1} ${binfile} -gdb_load ${binfile} + gdb_rename_execfile ${binfile1} ${binfile} + gdb_load ${binfile} -# Set a breakpoint at foo + # Set a breakpoint at foo -gdb_test "break foo" \ - "Breakpoint.*at.* file .*$srcfile1, line 14.*" \ - "breakpoint foo in first file" + gdb_test "break foo" \ + "Breakpoint.*at.* file .*$srcfile1, line 14.*" \ + "breakpoint foo in first file" -# Run, should see "Breakpoint 1, foo () at hello1.c:14" + # Run, should see "Breakpoint 1, foo () at hello1.c:14" -gdb_run_cmd -gdb_test "" "Breakpoint.* foo .* at .*$srcfile1:14.*" "run to foo()" + gdb_run_cmd + gdb_test "" "Breakpoint.* foo .* at .*$srcfile1:14.*" "run to foo()" -# Restore first executable to its original name, and move -# second executable into its place. Ensure that the new -# executable is at least a second newer than the old. + # Restore first executable to its original name, and move + # second executable into its place. Ensure that the new + # executable is at least a second newer than the old. -gdb_rename_execfile ${binfile} ${binfile1} -gdb_rename_execfile ${binfile2} ${binfile} -gdb_test "shell sleep 1" ".*" "" -gdb_touch_execfile ${binfile} + gdb_rename_execfile ${binfile} ${binfile1} + gdb_rename_execfile ${binfile2} ${binfile} + gdb_test "shell sleep 1" ".*" "" + gdb_touch_execfile ${binfile} -# Run a second time; GDB should detect that the executable has changed -# and reset the breakpoints correctly. -# Should see "Breakpoint 1, foo () at reread2.c:9" + # Run a second time; GDB should detect that the executable has changed + # and reset the breakpoints correctly. + # Should see "Breakpoint 1, foo () at reread2.c:9" -set test "run to foo() second time" -if [is_remote target] { - unsupported $test -} else { - gdb_run_cmd - gdb_test "" "Breakpoint.* foo .* at .*:9.*" $test -} + set test "run to foo() second time" + if [is_remote target] { + unsupported $test + } else { + gdb_run_cmd + gdb_test "" "Breakpoint.* foo .* at .*:9.*" $test + } -### Second pass: verify that GDB checks the executable file's -### timestamp when the program is *restarted*, not just when it exits. + ### Second pass: verify that GDB checks the executable file's + ### timestamp when the program is *restarted*, not just when it exits. -if [is_remote target] { - unsupported "second pass: GDB should check for changes before running" -} else { + if [is_remote target] { + unsupported "second pass: GDB should check for changes before running" + } else { - # Put the older executable back in place. - gdb_rename_execfile ${binfile} ${binfile2} - gdb_rename_execfile ${binfile1} ${binfile} + # Put the older executable back in place. + gdb_rename_execfile ${binfile} ${binfile2} + gdb_rename_execfile ${binfile1} ${binfile} - # Restart GDB entirely. - clean_restart ${binfile} + # Restart GDB entirely. + clean_restart ${binfile} - # Set a breakpoint on foo and run to it. - gdb_test "break foo" \ - "Breakpoint.*at.* file .*$srcfile1, line 14.*" \ - "second pass: breakpoint foo in first file" - gdb_run_cmd - gdb_test "" "Breakpoint.* foo .* at .*$srcfile1:14.*" "second pass: run to foo()" + # Set a breakpoint on foo and run to it. + gdb_test "break foo" \ + "Breakpoint.*at.* file .*$srcfile1, line 14.*" \ + "second pass: breakpoint foo in first file" + gdb_run_cmd + gdb_test "" "Breakpoint.* foo .* at .*$srcfile1:14.*" \ + "second pass: run to foo()" - # This time, let the program run to completion. If GDB checks the - # executable file's timestamp now, it won't notice any change. - gdb_continue_to_end "second pass" - - # Now move the newer executable into place, and re-run. GDB - # should still notice that the executable file has changed, - # and still re-set the breakpoint appropriately. - gdb_rename_execfile ${binfile} ${binfile1} - gdb_rename_execfile ${binfile2} ${binfile} - gdb_run_cmd - gdb_test "" "Breakpoint.* foo .* at .*:9.*" "second pass: run to foo() second time" -} + # This time, let the program run to completion. If GDB checks the + # executable file's timestamp now, it won't notice any change. + gdb_continue_to_end "second pass" -} + # Now move the newer executable into place, and re-run. GDB + # should still notice that the executable file has changed, + # and still re-set the breakpoint appropriately. + gdb_rename_execfile ${binfile} ${binfile1} + gdb_rename_execfile ${binfile2} ${binfile} + gdb_run_cmd + gdb_test "" "Breakpoint.* foo .* at .*:9.*" \ + "second pass: run to foo() second time" + } + + } # End of tests. return 0 -- 1.9.1