extend BTest "path" canonicalization to include compiled-to-C++ variable names

This commit is contained in:
Vern Paxson 2023-03-07 10:16:11 -08:00 committed by Arne Welzel
parent a934acc4f1
commit cdcd3f79aa
5 changed files with 9 additions and 8 deletions

View file

@ -1,2 +1,2 @@
### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
error in <...>/to_addr.zeek (C++), line 12: failed converting string to IP address (Users_vern_warehouse_zeek_zeek_master_02Mar23_testing_btest__tmp_bifs_to_addr_to_addr_zeek__global_stmts__zf() and not an IP)
error in <...>/to_addr.zeek (C++), line 12: failed converting string to IP address (<___>testing_btest__tmp_bifs_to_addr_to_addr_zeek__global_stmts__zf() and not an IP)

View file

@ -1,3 +1,3 @@
### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
error in <...>/to_double_from_string.zeek (C++), line 12: bad conversion to double (Users_vern_warehouse_zeek_zeek_master_02Mar23_testing_btest__tmp_bifs_to_double_from_string_to_double_from_string_zeek__global_stmts__zf() and NotADouble)
error in <...>/to_double_from_string.zeek (C++), line 12: bad conversion to double (Users_vern_warehouse_zeek_zeek_master_02Mar23_testing_btest__tmp_bifs_to_double_from_string_to_double_from_string_zeek__global_stmts__zf() and )
error in <...>/to_double_from_string.zeek (C++), line 12: bad conversion to double (<___>testing_btest__tmp_bifs_to_double_from_string_to_double_from_string_zeek__global_stmts__zf() and NotADouble)
error in <...>/to_double_from_string.zeek (C++), line 12: bad conversion to double (<___>testing_btest__tmp_bifs_to_double_from_string_to_double_from_string_zeek__global_stmts__zf() and )

View file

@ -1,4 +1,4 @@
### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
error in <...>/to_subnet.zeek (C++), line 6: failed converting string to IP prefix (Users_vern_warehouse_zeek_zeek_master_02Mar23_testing_btest__tmp_bifs_to_subnet_to_subnet_zeek__global_stmts__zf() and 10.0.0.0)
error in <...>/to_subnet.zeek (C++), line 6: failed converting string to IP prefix (Users_vern_warehouse_zeek_zeek_master_02Mar23_testing_btest__tmp_bifs_to_subnet_to_subnet_zeek__global_stmts__zf() and 10.0.0.0/222)
error in <...>/to_subnet.zeek (C++), line 6: failed converting string to IP prefix (Users_vern_warehouse_zeek_zeek_master_02Mar23_testing_btest__tmp_bifs_to_subnet_to_subnet_zeek__global_stmts__zf() and don't work)
error in <...>/to_subnet.zeek (C++), line 6: failed converting string to IP prefix (<___>testing_btest__tmp_bifs_to_subnet_to_subnet_zeek__global_stmts__zf() and 10.0.0.0)
error in <...>/to_subnet.zeek (C++), line 6: failed converting string to IP prefix (<___>testing_btest__tmp_bifs_to_subnet_to_subnet_zeek__global_stmts__zf() and 10.0.0.0/222)
error in <...>/to_subnet.zeek (C++), line 6: failed converting string to IP prefix (<___>testing_btest__tmp_bifs_to_subnet_to_subnet_zeek__global_stmts__zf() and don't work)

View file

@ -1,6 +1,6 @@
### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
error in <...>/create-failure.zeek (C++), line 61: Failed to attach master store backend_failure: (Users_vern_warehouse_zeek_zeek_master_02Mar23_testing_btest__tmp_broker_store_create_failure_create_failure_zeek__zeek_init__33__zf())
error in <...>/create-failure.zeek (C++), line 61: Could not create Broker master store '../fail' (Users_vern_warehouse_zeek_zeek_master_02Mar23_testing_btest__tmp_broker_store_create_failure_create_failure_zeek__zeek_init__33__zf())
error in <...>/create-failure.zeek (C++), line 61: Failed to attach master store backend_failure: (<___>testing_btest__tmp_broker_store_create_failure_create_failure_zeek__zeek_init__33__zf())
error in <...>/create-failure.zeek (C++), line 61: Could not create Broker master store '../fail' (<___>testing_btest__tmp_broker_store_create_failure_create_failure_zeek__zeek_init__33__zf())
error in <no location>: invalid Broker store handle (broker::store::{})
error in <no location>: invalid Broker store handle (broker::store::{})
error in <no location>: invalid Broker store handle (broker::store::{})

View file

@ -9,4 +9,5 @@ else
fi
$sed 's#/+#/#g' |
$sed 's#[^( ]*testing_btest#<___>testing_btest#' |
$sed 's#([a-zA-Z]:)?/([^ :/]{1,}/){1,}([^ :/]{1,})#<...>/\3#g'