OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

testsuite: Introduce dejagnu_version 

The next patch will require checking the DejaGnu version.  There is
already a test that does this,
gdb.threads/attach-many-short-lived-threads.exp.  This patch introduces
a new procedure, dejagnu_version, and makes that test use it.

The version number is "right-padded" with zeroes, to make sure that we
always return a triplet (major, minor, patch).

The procedure does not consider the DejaGnu versions from git.  For
example, if you used DejaGnu from its current master branch, the version
would be "1.6.1-git", meaning that 1.6.1 will be the next release.  I
figured we'll cross that bridge when (and if) we get there.

gdb/testsuite/ChangeLog:

	* lib/gdb.exp (dejagnu_version): New proc.
	* gdb.threads/attach-many-short-lived-threads.exp (bad_dejagnu):
	Use dejagnu_version.
This commit is contained in:
Simon Marchi 2017-03-13 18:02:07 -04:00
parent b9da89d161
commit 896c0c1ede
3 changed files with 33 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gdb/testsuite/ChangeLog
View File

@ -1,3 +1,9 @@
2017-03-13 Simon Marchi <simon.marchi@ericsson.com>
* lib/gdb.exp (dejagnu_version): New proc.
* gdb.threads/attach-many-short-lived-threads.exp (bad_dejagnu):
Use dejagnu_version.
2017-03-10 Keith Seitz <keiths@redhat.com>
PR c++/8128

8
gdb/testsuite/gdb.threads/attach-many-short-lived-threads.exp
View File

@ -24,13 +24,7 @@
# Return true if the running version of DejaGnu is known to not be
# able to run this test.
proc bad_dejagnu {} {
global frame_version
verbose -log "DejaGnu version: $frame_version"
verbose -log "Expect version: [exp_version]"
verbose -log "Tcl version: [info tclversion]"
set dj_ver [split $frame_version .]
set dj_ver [dejagnu_version]
set dj_ver_major [lindex $dj_ver 0]
set dj_ver_minor [lindex $dj_ver 1]

26
gdb/testsuite/lib/gdb.exp
View File

@ -6023,6 +6023,32 @@ proc multi_line_input { args } {
return [join $args "\n"]
}
# Return the version of the DejaGnu framework.
#
# The return value is a list containing the major, minor and patch version
# numbers. If the version does not contain a minor or patch number, they will
# be set to 0. For example:
#
# 1.6 -> {1 6 0}
# 1.6.1 -> {1 6 1}
# 2 -> {2 0 0}
proc dejagnu_version { } {
# The frame_version variable is defined by DejaGnu, in runtest.exp.
global frame_version
verbose -log "DejaGnu version: $frame_version"
verbose -log "Expect version: [exp_version]"
verbose -log "Tcl version: [info tclversion]"
set dg_ver [split $frame_version .]
while { [llength $dg_ver] < 3 } {
lappend dg_ver 0
}
return $dg_ver
}
# Always load compatibility stuff.
load_lib future.exp