From 829bdfa8f56bef52b9eb22d9e4753463cd945dd0 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Thu, 29 Oct 2015 02:08:31 +0000 Subject: [PATCH] Testing: autotest: Print id in log messages This makes the output from tests/run-all better. Signed-off-by: Ian Jackson --- tests/autotest | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/tests/autotest b/tests/autotest index 60ef3ff..1cea707 100755 --- a/tests/autotest +++ b/tests/autotest @@ -4,10 +4,12 @@ set testfile [lindex $argv 0] switch -glob -- $testfile { tests/*.at { - regsub {^tests/} $testfile {tests/tmp/} tt - regsub {\.at$} $tt {} tt + regsub {^tests/} $testfile {} id + regsub {\.at$} $id {} id + set tt "tests/tmp/$id" } * { + set id "\[[info pid]\]" set tt tests/tmp/[info pid] } } @@ -29,13 +31,14 @@ log_file -a $tt/expect.log proc timeout-abort {} { send_log "\r\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n" - error "aborting due to timeout" + error "$id: aborting due to timeout" } set timeout 10 proc elog {args} { + global id set m "[list expect [lindex $args end]]" - puts stderr $m + puts stderr "$id: $m" # send_log "\n$m\n" eval expect $args } @@ -79,4 +82,4 @@ proc loginas {user {password sesame} {wanttxt ACCESSGRANTED}} { source $testfile -puts ok +puts "$id: ok" -- 2.30.2