-# Copyright 2014 Free Software Foundation, Inc.
+# Copyright 2014-2020 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
load_lib gdb-python.exp
-if { [skip_cplus_tests] } { continue }
+if { [skip_cplus_tests] } {
+ untested "skipping C++ tests"
+ return
+}
standard_testfile py-xmethods.cc
-if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} {
+if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} {
return -1
}
# 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
gdb_continue_to_breakpoint "Break here" ".*Break here.*"
# Tests before loading the debug methods.
-gdb_test "p a1 + a2" ".* = 15" "Before: a1 + a2"
-gdb_test "p a_plus_a" ".* = 1" "Before: a_plus_a 1"
+gdb_test "p a1 + a2" ".* = 15" "before: a1 + a2"
+gdb_test "p a_plus_a" ".* = 1" "before: a_plus_a 1"
-gdb_test "p a2 - a1" ".* = 5" "Before: a2 - a1"
-gdb_test "p a_minus_a" ".* = 1" "Before: a_minus_a 1"
+gdb_test "p a2 - a1" ".* = 5" "before: a2 - a1"
+gdb_test "p a_minus_a" ".* = 1" "before: a_minus_a 1"
-gdb_test "p b1 - a1" ".* = 25" "Before: b1 - a1"
-gdb_test "p a_minus_a" ".* = 2" "Before: a_minus_a 2"
+gdb_test "p b1 - a1" ".* = 25" "before: b1 - a1"
+gdb_test "p a_minus_a" ".* = 2" "before: a_minus_a 2"
-gdb_test "p a1.geta()" ".* = 5" "Before: a1.geta()"
-gdb_test "p a_geta" ".* = 1" "Before: a_geta 1"
+gdb_test "p a1.geta()" ".* = 5" "before: a1.geta()"
+gdb_test "p a_geta" ".* = 1" "before: a_geta 1"
-gdb_test "p ++a1" "No symbol.*" "Before: ++a1"
+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"
+gdb_test "p a_ptr->geta()" ".* = 60" "before: a_ptr->geta()"
+gdb_test "p b_geta" ".* = 1" "before: b_geta 1"
-gdb_test "p e.geta()" ".* = 100" "Before: e.geta()"
-gdb_test "p a_geta" ".* = 2" "Before: a_geta 2"
+gdb_test "p e.geta()" ".* = 100" "before: e.geta()"
+gdb_test "p a_geta" ".* = 2" "before: a_geta 2"
# Since g.size_diff operates of sizes of int and float, do not check for
# actual result value as it could be different on different platforms.
-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<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<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<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"
# Tests after loading debug methods.
-gdb_test "p a1 + a2" "From Python <A_plus_A>.*15" "After: a1 + a2"
+gdb_test "p a1 + a2" "From Python <A_plus_A>.*15" "after: a1 + a2"
-gdb_test "p a2 - a1" ".* = 5" "After: a2 - a1"
-gdb_test "p a_minus_a" ".* = 3" "After: a_minus_a 3"
+gdb_test "p a2 - a1" ".* = 5" "after: a2 - a1"
+gdb_test "p a_minus_a" ".* = 3" "after: a_minus_a 3"
-gdb_test "p b1 + a1" "From Python <A_plus_A>.*35" "After: b1 + a1"
+gdb_test "p b1 + a1" "From Python <A_plus_A>.*35" "after: b1 + a1"
-gdb_test "p b1 - a1" ".* = 25" "After: b1 - a1"
-gdb_test "p a_minus_a" ".* = 4" "After: a_minus_a 4"
+gdb_test "p b1 - a1" ".* = 25" "after: b1 - a1"
+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.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
# currently. Hence, even though a_ptr points to a B object, the xmethod
# defined for A objects is invoked.
-gdb_test "p a_ptr->geta()" "From Python <A_geta>.*30" "After: a_ptr->geta()"
-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>.*" "After: e.method(10)"
-gdb_test "p e.method('a')" "From Python <E_method_char>.*" \
- "After: e.method('a')"
+gdb_test "p a_ptr->geta()" "From Python <A_geta>.*30" "after: a_ptr->geta()"
+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)"
+gdb_test "p e.method('a')" "From Python <E_method_char>.* = void" \
+ "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')"
+ "after: g_ptr->mul<char>('a')"
# Tests for 'disable/enable xmethod' command.
-gdb_test_no_output "disable xmethod .*xmethods G_methods" \
- "Disable G_methods"
+gdb_test_no_output "disable xmethod progspace 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 .*xmethods G_methods" \
- "Enable G_methods"
+gdb_test_no_output "enable xmethod progspace G_methods" \
+ "dnable G_methods"
gdb_test "p g.mul<char>('a')" "From Python G<>::mul.*" \
- "After enabling G_methods"
-gdb_test_no_output "disable xmethod .*xmethods G_methods;mul" \
- "Disable G_methods;mul"
+ "after enabling G_methods"
+gdb_test_no_output "disable xmethod progspace 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 .*xmethods G_methods;mul" \
- "Enable G_methods;mul"
+gdb_test_no_output "enable xmethod progspace 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" \
"info xmethod global plus 1"
-gdb_test_no_output "disable xmethod .*xmethods E_methods;method_int" \
- "disable xmethod .*xmethods E_methods;method_int"
-gdb_test "info xmethod .*xmethods E_methods;method_int" ".* \\\[disabled\\\]" \
+gdb_test_no_output "disable xmethod progspace E_methods;method_int" \
+ "disable xmethod progspace E_methods;method_int"
+gdb_test "info xmethod progspace E_methods;method_int" ".* \\\[disabled\\\]" \
"info xmethod xmethods E_methods;method_int"
-
-remote_file host delete ${xmethods_script}
+gdb_test_no_output "disable xmethod progspace G_methods" "disable G_methods 2"
+gdb_test "info xmethod progspace" ".*G_methods \\\[disabled\\\].*"
+
+# PR 18285
+# First make sure both are enabled.
+gdb_test_no_output "enable xmethod progspace E_methods;method_char"
+gdb_test_no_output "enable xmethod progspace E_methods;method_int"
+gdb_test "pt e.method('a')" "type = void"
+gdb_test "pt e.method(10)" \
+ "NotImplementedError.*Error while fetching result type of an xmethod worker defined in Python."
projects / deliverable / binutils-gdb.git / blobdiff