From 02eea3ecf08bcbee7b5d37c4c63029e29f7d9229 Mon Sep 17 00:00:00 2001 From: Christian Helmuth Date: Tue, 18 Jan 2022 11:40:18 +0100 Subject: [PATCH] More robust output parsing in ieee754 test Only parse output of the test programs one-by-one and ignore log messages from other components not starting with '[init -> test$number]'. Fixes sporadic failures on KERNEL=sel4 due to the following warning from core. Warning: flush page table entries - mapping cache full - PD: init -> test1 --- repos/libports/run/ieee754.run | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/repos/libports/run/ieee754.run b/repos/libports/run/ieee754.run index 855df8b4a5..e9d67d7028 100644 --- a/repos/libports/run/ieee754.run +++ b/repos/libports/run/ieee754.run @@ -3556,16 +3556,16 @@ if {[have_spec x86_32]} { set reference_output $reference_output_x86_32 } -proc filter_and_compare_output {pattern expected} { +proc filter_and_compare_output {number expected} { global output set old_output $output - grep_output "init -> $pattern" - unify_output {\[init -> test.\] } {} + grep_output "\\\[init -> test$number\\\]" + unify_output "\\\[init -> test$number\\\] " {} compare_output_to $expected set output $old_output } -filter_and_compare_output "test1" $reference_output -filter_and_compare_output "test2" $reference_output -filter_and_compare_output "test3" $reference_output -filter_and_compare_output "test4" $reference_output +filter_and_compare_output "1" $reference_output +filter_and_compare_output "2" $reference_output +filter_and_compare_output "3" $reference_output +filter_and_compare_output "4" $reference_output