Browse Source

* lib/target.exp (push_target): Remove unnecessary global command.

* testsuite/runtest.all/target.test: Overhaul tests.
dejagnu-1.6.1
Ben Elliston 9 years ago
parent
commit
616b897343
  1. 5
      ChangeLog
  2. 4
      lib/target.exp
  3. 159
      testsuite/runtest.all/target.test

5
ChangeLog

@ -1,3 +1,8 @@
2017-06-04 Ben Elliston <bje@gnu.org>
* lib/target.exp (push_target): Remove unnecessary global command.
* testsuite/runtest.all/target.test: Overhaul tests.
2017-06-04 Ben Elliston <bje@gnu.org>
* testsuite/runtest.all/remote.test: Remove cruft from yesteryear.

4
lib/target.exp

@ -57,9 +57,7 @@ set text "\[- A-Za-z0-9\.\;\"\_\:\'\`\(\)\!\#\=\+\?\&\*]"
# Set the target connection.
#
proc push_target { name } {
global target_abbrev
pop_config target
pop_config target
push_config target $name
}

159
testsuite/runtest.all/target.test

@ -62,42 +62,9 @@ set target_info(mvme,serial) "tstty8"
set target_info(mvme,netport) "localhost:23"
set target_info(mvme,baud) "9600"
# Test remote open. We try not to use any of the support procs in
# target.exp to for isolation testing. "target" is the name of the
# default array setup by the procs in target.exp.
set timeout 100
# test push_config target
push_config target idp
set matches 0
if { $target_info(target,name) == "idp" } {
incr matches
}
if { $target_info(target,ldflags) == "-Tidp.ld" } {
incr matches
}
if { $target_info(target,config) == "m68k-unknown-aout" } {
incr matches
}
if { $target_info(target,cflags) == "" } {
incr matches
}
if { $target_info(target,connect) == "telnet" } {
incr matches
}
if { $target_info(target,target) == "s12" } {
incr matches
}
if { $target_info(target,serial) == "tstty12" } {
incr matches
}
if { $target_info(target,netport) == "localhost:23" } {
incr matches
}
if { $target_info(target,baud) == "9600" } {
incr matches
}
if { $matches == 9 } {
puts "PASSED: push_config target"
} else {
puts "FAILED: push_config target"
@ -105,70 +72,14 @@ if { $matches == 9 } {
# test pop_config target
pop_config target
set matches 0
if { $target_info(target,name) == "" } {
incr matches
}
if { $target_info(target,ldflags) == "" } {
incr matches
}
if { $target_info(target,config) == "" } {
incr matches
}
if { $target_info(target,cflags) == "" } {
incr matches
}
if { $target_info(target,connect) == "" } {
incr matches
}
if { $target_info(target,target) == "" } {
incr matches
}
if { $target_info(target,serial) == "" } {
incr matches
}
if { $target_info(target,netport) == "" } {
incr matches
}
if { $target_info(target,baud) == "" } {
incr matches
}
if { $matches == 9 } {
if { ![info exists target_info(target,name)] } {
puts "PASSED: pop_config target"
} else {
puts "FAILED: pop_config target"
}
push_config host idp
set matches 0
if { $target_info(host,name) == "idp" } {
incr matches
}
if { $target_info(host,ldflags) == "-Tidp.ld" } {
incr matches
}
if { $target_info(host,config) == "m68k-unknown-aout" } {
incr matches
}
if { $target_info(host,cflags) == "" } {
incr matches
}
if { $target_info(host,connect) == "telnet" } {
incr matches
}
if { $target_info(host,target) == "s12" } {
incr matches
}
if { $target_info(host,serial) == "tstty12" } {
incr matches
}
if { $target_info(host,netport) == "localhost:23" } {
incr matches
}
if { $target_info(host,baud) == "9600" } {
incr matches
}
if { $matches == 9 } {
puts "PASSED: push_config target"
} else {
puts "FAILED: push_config target"
@ -176,70 +87,8 @@ if { $matches == 9 } {
# test pop_config host
pop_config host
set matches 0
if { $target_info(host,name) == "" } {
incr matches
}
if { $target_info(host,ldflags) == "" } {
incr matches
}
if { $target_info(host,config) == "" } {
incr matches
}
if { $target_info(host,cflags) == "" } {
incr matches
}
if { $target_info(host,connect) == "" } {
incr matches
}
if { $target_info(host,target) == "" } {
incr matches
}
if { $target_info(host,serial) == "" } {
incr matches
}
if { $target_info(host,netport) == "" } {
incr matches
}
if { $target_info(host,baud) == "" } {
incr matches
}
if { $matches == 9 } {
puts "PASSED: pop_config host"
if { ![info exists target_info(host,name)] } {
puts "PASSED: pop_config host"
} else {
puts "FAILED: pop_config host"
}
# test execute_anywhere for a native environment
set host_triplet i586-unknown-linux
set target_triplet i586-unknown-linux
set build_triplet i586-unknown-linux
if { [string match "*setval.tmp*" [execute_anywhere "ls"]] } {
puts "PASSED: execute_anywhere, native"
} else {
puts "FAILED: execute_anywhere, native"
}
# test execute_anywhere for a normal cross
set target_triplet m68k-unknown-coff
if { [string match "*testsuite" [execute_anywhere "pwd"]] } {
puts "PASSED: execute_anywhere, normal cross"
} else {
puts "FAILED: execute_anywhere, normal cross"
}
# test execute_anywhere for a canadian cross
set build_triplet m68k-test-test
set target_info(host,connect) rlogin
set target_info(host,netport) $target_info(idp,netport)
set target_info(host,target) localhost
if { [string match "*FooBar*" [execute_anywhere "echo FooBar"]] } {
puts "PASSED: execute_anywhere, canadian cross"
} else {
puts "FAILED: execute_anywhere, canadian cross"
}
# compile arg
# archive arg
# ranlib arg
# link_objects arg

Loading…
Cancel
Save