* [PATCH] Fix uppercase test names in gdb.python/py-xmethods.exp
@ 2017-01-20 14:37 Luis Machado
2017-01-20 15:25 ` Pedro Alves
0 siblings, 1 reply; 7+ messages in thread
From: Luis Machado @ 2017-01-20 14:37 UTC (permalink / raw)
To: gdb-patches
Some leftover uppercase test names in py-xmethods.exp. The patch also
replaces two "continue" calls with untested calls to make things a bit more
clear.
gdb/testsuite/ChangeLog:
2017-01-20 Luis Machado <lgustavo@codesourcery.com>
* gdb.python/py-xmethods.exp: Fix test names starting with lowercase
and add untested calls.
---
gdb/testsuite/gdb.python/py-xmethods.exp | 44 +++++++++++++++++---------------
1 file changed, 24 insertions(+), 20 deletions(-)
diff --git a/gdb/testsuite/gdb.python/py-xmethods.exp b/gdb/testsuite/gdb.python/py-xmethods.exp
index 8f5bf16..38b5998 100644
--- a/gdb/testsuite/gdb.python/py-xmethods.exp
+++ b/gdb/testsuite/gdb.python/py-xmethods.exp
@@ -18,7 +18,9 @@
load_lib gdb-python.exp
-if { [skip_cplus_tests] } { continue }
+if { [skip_cplus_tests] } {
+ untested "skipping C++ tests"
+}
standard_testfile py-xmethods.cc
@@ -27,7 +29,9 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} {
}
# Skip all tests if Python scripting is not enabled.
-if { [skip_python_tests] } { continue }
+if { [skip_python_tests] } {
+ untested "skipping Python tests"
+}
if ![runto_main] {
return -1
@@ -54,7 +58,7 @@ gdb_test "p a_geta" ".* = 1" "before: a_geta 1"
gdb_test "p ++a1" "No symbol.*" "before: ++a1"
gdb_test "p a1.getarrayind(5)" "Couldn't find method.*" \
- "Before: a1.getarrayind(5)"
+ "before: a1.getarrayind(5)"
gdb_test "p a_ptr->geta()" ".* = 60" "before: a_ptr->geta()"
gdb_test "p b_geta" ".* = 1" "before: b_geta 1"
@@ -68,19 +72,19 @@ gdb_test "p g.size_diff<float>()" ".*" "before: call g.size_diff<float>()"
gdb_test "p g_size_diff" ".* = 2" "before: g_size_diff 2"
gdb_test "p g.size_diff<unsigned long>()" "Couldn't find method.*" \
- "Before: g.size_diff<unsigned long>()"
+ "before: g.size_diff<unsigned long>()"
gdb_test "p g.size_mul<2>()" ".*" "before: g.size_mul<2>()"
gdb_test "p g_size_mul" ".* = 2" "before: g_size_mul 2"
gdb_test "p g.size_mul<5>()" "Couldn't find method.*" \
- "Before: g.size_mul<5>()"
+ "before: g.size_mul<5>()"
gdb_test "p g.mul<double>(2.0)" ".* = 10" "before: g.mul<double>(2.0)"
gdb_test "p g_mul" ".* = 2" "before: g_mul 2"
gdb_test "p g.mul<char>('a')" "Couldn't find method.*" \
- "Before: g.mul<char>('a')"
+ "before: g.mul<char>('a')"
# Load the script which adds the debug methods.
gdb_test_no_output "source ${xmethods_script}" "load the script file"
@@ -99,7 +103,7 @@ gdb_test "p a_minus_a" ".* = 4" "after: a_minus_a 4"
gdb_test "p a1.geta()" "From Python <A_geta>.*5" "after: a1.geta()"
gdb_test "p ++a1" "From Python <plus_plus_A>.*6" "after: ++a1"
gdb_test "p a1.getarrayind(5)" "From Python <A_getarrayind>.*5" \
- "After: a1.getarrayind(5)"
+ "after: a1.getarrayind(5)"
gdb_test "P a1\[6\]" ".*int &.*6" "after a1\[\]"
gdb_test "P b1\[7\]" ".*const int &.*7" "after b1\[\]"
# Note the following test. Xmethods on dynamc types are not looked up
@@ -110,40 +114,40 @@ gdb_test "p e.geta()" "From Python <A_geta>.*100" "after: e.geta()"
gdb_test "p e_ptr->geta()" "From Python <A_geta>.*100" "after: e_ptr->geta()"
gdb_test "p e_ref.geta()" "From Python <A_geta>.*100" "after: e_ref.geta()"
gdb_test "p e.method(10)" "From Python <E_method_int>.* = void" \
- "After: e.method(10)"
+ "after: e.method(10)"
gdb_test "p e.method('a')" "From Python <E_method_char>.* = void" \
- "After: e.method('a')"
+ "after: e.method('a')"
gdb_test "p g.size_diff<float> ()" "From Python G<>::size_diff.*" \
- "After: g.size_diff<float>()"
+ "after: g.size_diff<float>()"
gdb_test "p g.size_diff< unsigned long >()" "From Python G<>::size_diff.*" \
- "After: g.size_diff<unsigned long>()"
+ "after: g.size_diff<unsigned long>()"
gdb_test "p g.size_mul<2>()" "From Python G<>::size_mul.*" \
- "After: g.size_mul<2>()"
+ "after: g.size_mul<2>()"
gdb_test "p g.size_mul< 5 >()" "From Python G<>::size_mul.*" \
- "After: g.size_mul< 5 >()"
+ "after: g.size_mul< 5 >()"
gdb_test "p g.mul<double>(2.0)" "From Python G<>::mul.*" \
- "After: g.mul<double>(2.0)"
+ "after: g.mul<double>(2.0)"
gdb_test "p g.mul<char>('a')" "From Python G<>::mul.*" \
gdb_test "p g_ptr->mul<char>('a')" "From Python G<>::mul.*" \
"after: g_ptr->mul<char>('a')"
# Tests for 'disable/enable xmethod' command.
gdb_test_no_output "disable xmethod progspace G_methods" \
- "Disable G_methods"
+ "disable G_methods"
gdb_test "p g.mul<char>('a')" "Couldn't find method.*" \
"g.mul<char>('a') after disabling G_methods"
gdb_test_no_output "enable xmethod progspace G_methods" \
- "Enable G_methods"
+ "dnable G_methods"
gdb_test "p g.mul<char>('a')" "From Python G<>::mul.*" \
- "After enabling G_methods"
+ "after enabling G_methods"
gdb_test_no_output "disable xmethod progspace G_methods;mul" \
- "Disable G_methods;mul"
+ "disable G_methods;mul"
gdb_test "p g.mul<char>('a')" "Couldn't find method.*" \
"g.mul<char>('a') after disabling G_methods;mul"
gdb_test_no_output "enable xmethod progspace G_methods;mul" \
- "Enable G_methods;mul"
+ "enable G_methods;mul"
gdb_test "p g.mul<char>('a')" "From Python G<>::mul.*" \
- "After enabling G_methods;mul"
+ "after enabling G_methods;mul"
# Test for 'info xmethods' command
gdb_test "info xmethod global plus" "global.*plus_plus_A" \
--
2.7.4
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH] Fix uppercase test names in gdb.python/py-xmethods.exp
2017-01-20 14:37 [PATCH] Fix uppercase test names in gdb.python/py-xmethods.exp Luis Machado
@ 2017-01-20 15:25 ` Pedro Alves
2017-01-20 15:30 ` Luis Machado
0 siblings, 1 reply; 7+ messages in thread
From: Pedro Alves @ 2017-01-20 15:25 UTC (permalink / raw)
To: Luis Machado, gdb-patches
On 01/20/2017 02:37 PM, Luis Machado wrote:
> Some leftover uppercase test names in py-xmethods.exp. The patch also
> replaces two "continue" calls with untested calls to make things a bit more
> clear.
>
> gdb/testsuite/ChangeLog:
>
> 2017-01-20 Luis Machado <lgustavo@codesourcery.com>
>
> * gdb.python/py-xmethods.exp: Fix test names starting with lowercase
> and add untested calls.
> ---
> gdb/testsuite/gdb.python/py-xmethods.exp | 44 +++++++++++++++++---------------
> 1 file changed, 24 insertions(+), 20 deletions(-)
>
> diff --git a/gdb/testsuite/gdb.python/py-xmethods.exp b/gdb/testsuite/gdb.python/py-xmethods.exp
> index 8f5bf16..38b5998 100644
> --- a/gdb/testsuite/gdb.python/py-xmethods.exp
> +++ b/gdb/testsuite/gdb.python/py-xmethods.exp
> @@ -18,7 +18,9 @@
>
> load_lib gdb-python.exp
>
> -if { [skip_cplus_tests] } { continue }
> +if { [skip_cplus_tests] } {
> + untested "skipping C++ tests"
> +}
We still need something that makes the test
actually be skipped.
Thanks,
Pedro Alves
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH] Fix uppercase test names in gdb.python/py-xmethods.exp
2017-01-20 15:25 ` Pedro Alves
@ 2017-01-20 15:30 ` Luis Machado
2017-01-20 15:34 ` Pedro Alves
0 siblings, 1 reply; 7+ messages in thread
From: Luis Machado @ 2017-01-20 15:30 UTC (permalink / raw)
To: Pedro Alves, gdb-patches
[-- Attachment #1: Type: text/plain, Size: 1119 bytes --]
On 01/20/2017 09:24 AM, Pedro Alves wrote:
> On 01/20/2017 02:37 PM, Luis Machado wrote:
>> Some leftover uppercase test names in py-xmethods.exp. The patch also
>> replaces two "continue" calls with untested calls to make things a bit more
>> clear.
>>
>> gdb/testsuite/ChangeLog:
>>
>> 2017-01-20 Luis Machado <lgustavo@codesourcery.com>
>>
>> * gdb.python/py-xmethods.exp: Fix test names starting with lowercase
>> and add untested calls.
>> ---
>> gdb/testsuite/gdb.python/py-xmethods.exp | 44 +++++++++++++++++---------------
>> 1 file changed, 24 insertions(+), 20 deletions(-)
>>
>> diff --git a/gdb/testsuite/gdb.python/py-xmethods.exp b/gdb/testsuite/gdb.python/py-xmethods.exp
>> index 8f5bf16..38b5998 100644
>> --- a/gdb/testsuite/gdb.python/py-xmethods.exp
>> +++ b/gdb/testsuite/gdb.python/py-xmethods.exp
>> @@ -18,7 +18,9 @@
>>
>> load_lib gdb-python.exp
>>
>> -if { [skip_cplus_tests] } { continue }
>> +if { [skip_cplus_tests] } {
>> + untested "skipping C++ tests"
>> +}
>
> We still need something that makes the test
> actually be skipped.
>
Don't we? Oops.
How about the following?
[-- Attachment #2: 0001-Fix-uppercase-test-names-in-gdb.python-py-xmethods.e.patch --]
[-- Type: text/x-patch, Size: 5578 bytes --]
From bed2ac369d21b4dd03d6a5cff1ab8dc432dd2ac9 Mon Sep 17 00:00:00 2001
From: Luis Machado <lgustavo@codesourcery.com>
Date: Wed, 18 Jan 2017 12:11:27 -0600
Subject: [PATCH] Fix uppercase test names in gdb.python/py-xmethods.exp
Some leftover uppercase test names in py-xmethods.exp. The patch also
replaces two "continue" calls with untested calls to make things a bit more
clear.
gdb/testsuite/ChangeLog:
2017-01-20 Luis Machado <lgustavo@codesourcery.com>
* gdb.python/py-xmethods.exp: Fix test names starting with lowercase
and add untested calls.
---
gdb/testsuite/gdb.python/py-xmethods.exp | 46 ++++++++++++++++++--------------
1 file changed, 26 insertions(+), 20 deletions(-)
diff --git a/gdb/testsuite/gdb.python/py-xmethods.exp b/gdb/testsuite/gdb.python/py-xmethods.exp
index 8f5bf16..dcd7191 100644
--- a/gdb/testsuite/gdb.python/py-xmethods.exp
+++ b/gdb/testsuite/gdb.python/py-xmethods.exp
@@ -18,7 +18,10 @@
load_lib gdb-python.exp
-if { [skip_cplus_tests] } { continue }
+if { [skip_cplus_tests] } {
+ untested "skipping C++ tests"
+ return
+}
standard_testfile py-xmethods.cc
@@ -27,7 +30,10 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} {
}
# Skip all tests if Python scripting is not enabled.
-if { [skip_python_tests] } { continue }
+if { [skip_python_tests] } {
+ untested "skipping Python tests"
+ return
+}
if ![runto_main] {
return -1
@@ -54,7 +60,7 @@ gdb_test "p a_geta" ".* = 1" "before: a_geta 1"
gdb_test "p ++a1" "No symbol.*" "before: ++a1"
gdb_test "p a1.getarrayind(5)" "Couldn't find method.*" \
- "Before: a1.getarrayind(5)"
+ "before: a1.getarrayind(5)"
gdb_test "p a_ptr->geta()" ".* = 60" "before: a_ptr->geta()"
gdb_test "p b_geta" ".* = 1" "before: b_geta 1"
@@ -68,19 +74,19 @@ gdb_test "p g.size_diff<float>()" ".*" "before: call g.size_diff<float>()"
gdb_test "p g_size_diff" ".* = 2" "before: g_size_diff 2"
gdb_test "p g.size_diff<unsigned long>()" "Couldn't find method.*" \
- "Before: g.size_diff<unsigned long>()"
+ "before: g.size_diff<unsigned long>()"
gdb_test "p g.size_mul<2>()" ".*" "before: g.size_mul<2>()"
gdb_test "p g_size_mul" ".* = 2" "before: g_size_mul 2"
gdb_test "p g.size_mul<5>()" "Couldn't find method.*" \
- "Before: g.size_mul<5>()"
+ "before: g.size_mul<5>()"
gdb_test "p g.mul<double>(2.0)" ".* = 10" "before: g.mul<double>(2.0)"
gdb_test "p g_mul" ".* = 2" "before: g_mul 2"
gdb_test "p g.mul<char>('a')" "Couldn't find method.*" \
- "Before: g.mul<char>('a')"
+ "before: g.mul<char>('a')"
# Load the script which adds the debug methods.
gdb_test_no_output "source ${xmethods_script}" "load the script file"
@@ -99,7 +105,7 @@ gdb_test "p a_minus_a" ".* = 4" "after: a_minus_a 4"
gdb_test "p a1.geta()" "From Python <A_geta>.*5" "after: a1.geta()"
gdb_test "p ++a1" "From Python <plus_plus_A>.*6" "after: ++a1"
gdb_test "p a1.getarrayind(5)" "From Python <A_getarrayind>.*5" \
- "After: a1.getarrayind(5)"
+ "after: a1.getarrayind(5)"
gdb_test "P a1\[6\]" ".*int &.*6" "after a1\[\]"
gdb_test "P b1\[7\]" ".*const int &.*7" "after b1\[\]"
# Note the following test. Xmethods on dynamc types are not looked up
@@ -110,40 +116,40 @@ gdb_test "p e.geta()" "From Python <A_geta>.*100" "after: e.geta()"
gdb_test "p e_ptr->geta()" "From Python <A_geta>.*100" "after: e_ptr->geta()"
gdb_test "p e_ref.geta()" "From Python <A_geta>.*100" "after: e_ref.geta()"
gdb_test "p e.method(10)" "From Python <E_method_int>.* = void" \
- "After: e.method(10)"
+ "after: e.method(10)"
gdb_test "p e.method('a')" "From Python <E_method_char>.* = void" \
- "After: e.method('a')"
+ "after: e.method('a')"
gdb_test "p g.size_diff<float> ()" "From Python G<>::size_diff.*" \
- "After: g.size_diff<float>()"
+ "after: g.size_diff<float>()"
gdb_test "p g.size_diff< unsigned long >()" "From Python G<>::size_diff.*" \
- "After: g.size_diff<unsigned long>()"
+ "after: g.size_diff<unsigned long>()"
gdb_test "p g.size_mul<2>()" "From Python G<>::size_mul.*" \
- "After: g.size_mul<2>()"
+ "after: g.size_mul<2>()"
gdb_test "p g.size_mul< 5 >()" "From Python G<>::size_mul.*" \
- "After: g.size_mul< 5 >()"
+ "after: g.size_mul< 5 >()"
gdb_test "p g.mul<double>(2.0)" "From Python G<>::mul.*" \
- "After: g.mul<double>(2.0)"
+ "after: g.mul<double>(2.0)"
gdb_test "p g.mul<char>('a')" "From Python G<>::mul.*" \
gdb_test "p g_ptr->mul<char>('a')" "From Python G<>::mul.*" \
"after: g_ptr->mul<char>('a')"
# Tests for 'disable/enable xmethod' command.
gdb_test_no_output "disable xmethod progspace G_methods" \
- "Disable G_methods"
+ "disable G_methods"
gdb_test "p g.mul<char>('a')" "Couldn't find method.*" \
"g.mul<char>('a') after disabling G_methods"
gdb_test_no_output "enable xmethod progspace G_methods" \
- "Enable G_methods"
+ "dnable G_methods"
gdb_test "p g.mul<char>('a')" "From Python G<>::mul.*" \
- "After enabling G_methods"
+ "after enabling G_methods"
gdb_test_no_output "disable xmethod progspace G_methods;mul" \
- "Disable G_methods;mul"
+ "disable G_methods;mul"
gdb_test "p g.mul<char>('a')" "Couldn't find method.*" \
"g.mul<char>('a') after disabling G_methods;mul"
gdb_test_no_output "enable xmethod progspace G_methods;mul" \
- "Enable G_methods;mul"
+ "enable G_methods;mul"
gdb_test "p g.mul<char>('a')" "From Python G<>::mul.*" \
- "After enabling G_methods;mul"
+ "after enabling G_methods;mul"
# Test for 'info xmethods' command
gdb_test "info xmethod global plus" "global.*plus_plus_A" \
--
2.7.4
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH] Fix uppercase test names in gdb.python/py-xmethods.exp
2017-01-20 15:30 ` Luis Machado
@ 2017-01-20 15:34 ` Pedro Alves
2017-01-20 15:43 ` Luis Machado
0 siblings, 1 reply; 7+ messages in thread
From: Pedro Alves @ 2017-01-20 15:34 UTC (permalink / raw)
To: Luis Machado, gdb-patches
On 01/20/2017 03:30 PM, Luis Machado wrote:
>
> How about the following?
> # Skip all tests if Python scripting is not enabled.
> -if { [skip_python_tests] } { continue }
> +if { [skip_python_tests] } {
> + untested "skipping Python tests"
> + return
> +}
>
There's an "unsupported" call inside skip_python_tests.
Thanks,
Pedro Alves
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH] Fix uppercase test names in gdb.python/py-xmethods.exp
2017-01-20 15:34 ` Pedro Alves
@ 2017-01-20 15:43 ` Luis Machado
2017-01-20 16:45 ` Pedro Alves
0 siblings, 1 reply; 7+ messages in thread
From: Luis Machado @ 2017-01-20 15:43 UTC (permalink / raw)
To: Pedro Alves, gdb-patches
On 01/20/2017 09:34 AM, Pedro Alves wrote:
> On 01/20/2017 03:30 PM, Luis Machado wrote:
>
>>
>> How about the following?
>
>
>> # Skip all tests if Python scripting is not enabled.
>> -if { [skip_python_tests] } { continue }
>> +if { [skip_python_tests] } {
>> + untested "skipping Python tests"
>> + return
>> +}
>>
>
> There's an "unsupported" call inside skip_python_tests.
Hmm, i was working under the assumption this was a flag. In this case it
would make sense to handle all of these checks in the same way and not
add untested calls, making everything standard.
I can work on that, but should we drop adding any untested calls in this
particular patch and only return (until a follow on patch)?
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH] Fix uppercase test names in gdb.python/py-xmethods.exp
2017-01-20 15:43 ` Luis Machado
@ 2017-01-20 16:45 ` Pedro Alves
2017-01-20 20:00 ` Luis Machado
0 siblings, 1 reply; 7+ messages in thread
From: Pedro Alves @ 2017-01-20 16:45 UTC (permalink / raw)
To: Luis Machado, gdb-patches
On 01/20/2017 03:43 PM, Luis Machado wrote:
>> There's an "unsupported" call inside skip_python_tests.
>
> Hmm, i was working under the assumption this was a flag.
Yeah, it's surprising. I wouldn't mind removing it. Maybe
make it a "verbose" call instead.
> In this case it
> would make sense to handle all of these checks in the same way and not
> add untested calls, making everything standard.
> I can work on that, but should we drop adding any untested calls in this
> particular patch and only return (until a follow on patch)?
I gave it a second thought, and it's fine with me to add the
untested call, despite the UNSUPPORTED already present in gdb.sum.
Patch is OK.
Thanks,
Pedro Alves
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] Fix uppercase test names in gdb.python/py-xmethods.exp
2017-01-20 16:45 ` Pedro Alves
@ 2017-01-20 20:00 ` Luis Machado
0 siblings, 0 replies; 7+ messages in thread
From: Luis Machado @ 2017-01-20 20:00 UTC (permalink / raw)
To: Pedro Alves, gdb-patches
On 01/20/2017 10:45 AM, Pedro Alves wrote:
> On 01/20/2017 03:43 PM, Luis Machado wrote:
>
>>> There's an "unsupported" call inside skip_python_tests.
>>
>> Hmm, i was working under the assumption this was a flag.
>
> Yeah, it's surprising. I wouldn't mind removing it. Maybe
> make it a "verbose" call instead.
>
I'll get something out for that.
>> In this case it
>> would make sense to handle all of these checks in the same way and not
>> add untested calls, making everything standard.
>> I can work on that, but should we drop adding any untested calls in this
>> particular patch and only return (until a follow on patch)?
>
> I gave it a second thought, and it's fine with me to add the
> untested call, despite the UNSUPPORTED already present in gdb.sum.
>
> Patch is OK.
I've pushed this to master with the untested calls as
23e829301bd42b3964f457d50e462195d4343590.
Thanks,
Luis
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2017-01-20 20:00 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-01-20 14:37 [PATCH] Fix uppercase test names in gdb.python/py-xmethods.exp Luis Machado
2017-01-20 15:25 ` Pedro Alves
2017-01-20 15:30 ` Luis Machado
2017-01-20 15:34 ` Pedro Alves
2017-01-20 15:43 ` Luis Machado
2017-01-20 16:45 ` Pedro Alves
2017-01-20 20:00 ` Luis Machado
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox