Commit 2d43b862 by Tom de Vries Committed by Tom de Vries

[testsuite] Fix get-absolute-line error handling

2018-07-01  Tom de Vries  <tdevries@suse.de>

	* gcc.dg-selftests/dg-final.exp (verify_call_1): Factor out of ...
	(verify_call): ... here.  Move to toplevel.
	(verify_call_np, dg_final_directive_check_utils): New proc.
	(toplevel): Call dg_final_directive_check_utils.
	* lib/gcc-dg.exp (get-absolute-line): Fix typo in variable reference.

From-SVN: r262284
parent 6b150ce9
2018-07-01 Tom de Vries <tdevries@suse.de>
* gcc.dg-selftests/dg-final.exp (verify_call_1): Factor out of ...
(verify_call): ... here. Move to toplevel.
(verify_call_np, dg_final_directive_check_utils): New proc.
(toplevel): Call dg_final_directive_check_utils.
* lib/gcc-dg.exp (get-absolute-line): Fix typo in variable reference.
2018-06-30 Jim Wilson <jimw@sifive.com> 2018-06-30 Jim Wilson <jimw@sifive.com>
* gcc.target/riscv/shift-shift-1.c: New. * gcc.target/riscv/shift-shift-1.c: New.
......
...@@ -25,29 +25,47 @@ load_lib "scanasm.exp" ...@@ -25,29 +25,47 @@ load_lib "scanasm.exp"
load_lib "scanwpaipa.exp" load_lib "scanwpaipa.exp"
load_lib "scanltranstree.exp" load_lib "scanltranstree.exp"
load_lib "scanoffloadtree.exp" load_lib "scanoffloadtree.exp"
load_lib "gcc-dg.exp"
proc dg_final_directive_check_num_args {} { proc verify_call_1 { args } {
proc verify_call { args } { set call_name [lindex $args 0]
set call_name [lindex $args 0] set call_args [lindex $args 1]
set call_args [lindex $args 1] set expected_error [lindex $args 2]
set expected_error [lindex $args 2] set testid [lindex $args 3]
set errMsg "" set errMsg ""
catch { catch {
eval $call_name $call_args eval $call_name $call_args
} errMsg } errMsg
if { "$errMsg" != "$call_name: $expected_error" } { if { "$errMsg" != "$expected_error" } {
send_log "For call $call_name $call_args\n" send_log "For call $call_name $call_args\n"
send_log "expected: $call_name: $expected_error\n" send_log "expected: $expected_error\n"
send_log "but got: $errMsg\n" send_log "but got: $errMsg\n"
fail "$call_name: $expected_error" fail "$testid"
return return
} else { } else {
pass "$call_name: $expected_error" pass "$testid"
}
} }
}
proc verify_call { args } {
set call_name [lindex $args 0]
set call_args [lindex $args 1]
set expected_error [lindex $args 2]
verify_call_1 $call_name $call_args "$call_name: $expected_error" \
"$call_name: $expected_error"
}
proc verify_call_np { args } {
set call_name [lindex $args 0]
set call_args [lindex $args 1]
set expected_error [lindex $args 2]
verify_call_1 $call_name $call_args "$expected_error" \
"$call_name: $expected_error"
}
proc dg_final_directive_check_num_args {} {
proc verify_args { args } { proc verify_args { args } {
set proc_name [lindex $args 0] set proc_name [lindex $args 0]
set min [lindex $args 1] set min [lindex $args 1]
...@@ -98,9 +116,17 @@ proc dg_final_directive_check_num_args {} { ...@@ -98,9 +116,17 @@ proc dg_final_directive_check_num_args {} {
unset testname_with_flags unset testname_with_flags
} }
proc dg_final_directive_check_utils {} {
verify_call_np get-absolute-line [list "" bla] \
"dg-line var bla used, but not defined"
verify_call_np get-absolute-line [list 1 bla] \
"dg-line var bla used at line 1, but not defined"
}
if ![gcc_parallel_test_run_p dg-final] { if ![gcc_parallel_test_run_p dg-final] {
return return
} }
gcc_parallel_test_enable 0 gcc_parallel_test_enable 0
dg_final_directive_check_num_args dg_final_directive_check_num_args
dg_final_directive_check_utils
gcc_parallel_test_enable 1 gcc_parallel_test_enable 1
...@@ -1085,7 +1085,7 @@ proc get-absolute-line { useline line } { ...@@ -1085,7 +1085,7 @@ proc get-absolute-line { useline line } {
eval set var_defined [info exists $varname] eval set var_defined [info exists $varname]
if { ! $var_defined } { if { ! $var_defined } {
if { "$useline" != "" } { if { "$useline" != "" } {
error "dg-line var $org_varname used at line $uselinenr, but not defined" error "dg-line var $org_varname used at line $useline, but not defined"
} else { } else {
error "dg-line var $org_varname used, but not defined" error "dg-line var $org_varname used, but not defined"
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment