Commit ded6c3b6 authored by Ille, Ondrej, Ing.'s avatar Ille, Ondrej, Ing.

Merge branch '248-tests-output-does-not-respect-verbosity-settings' into 'master'

Resolve "tests: output does not respect verbosity settings"

Closes #248

See merge request !217
parents d710c954 7ed6f0e7
Pipeline #6229 failed with stages
in 62 minutes and 57 seconds
......@@ -120,7 +120,7 @@ package body txt_buffer_hazard_feature is
CAN_insert_TX_frame(CAN_frame, 1, ID_1, mem_bus(1));
-- Repeat test several times
for i in 1 to 200 loop
for i in 1 to 100 loop
-- Give "Set ready" command to the buffer
send_TXT_buf_cmd(buf_set_ready, 1, ID_1, mem_bus(1));
......
......@@ -2025,10 +2025,12 @@ package body CANtestLib is
show_all(display_handler);
hide(display_handler, debug);
hide(display_handler, info);
hide(display_handler, pass);
hide(display_handler, warning);
when warning_l =>
show_all(display_handler);
hide(display_handler, debug);
hide(display_handler, pass);
hide(display_handler, info);
when info_l =>
show_all(display_handler);
......@@ -2449,19 +2451,19 @@ package body CANtestLib is
end procedure;
impure function aval_is_invalid_burst_size(
impure function aval_is_valid_burst_size(
constant data_length : natural
) return boolean
is
begin
if ((data_length mod 4) = 0) then
if ((data_length mod 32) /= 0) then
warning("Invalid Avalon Burst size: "
& integer'image(data_length) &
" Burst size should be 32 bit aligned!");
return false;
end if;
if ((data_length / 4) > 64) then
if ((data_length / 32) > 64) then
warning("Invalid Avalon Burst size: "
& integer'image(data_length) &
" Burst size should not be larger than 64 words! " &
......@@ -2490,7 +2492,7 @@ package body CANtestLib is
return;
end if;
if (aval_is_invalid_burst_size(w_data'length)) then
if (not aval_is_valid_burst_size(w_data'length)) then
return;
end if;
......@@ -2543,7 +2545,7 @@ package body CANtestLib is
return;
end if;
if (aval_is_invalid_burst_size(r_data'length)) then
if (not aval_is_valid_burst_size(r_data'length)) then
return;
end if;
......
......@@ -922,10 +922,11 @@ begin
end if;
-- If any of the nodes turned error passive
check_false(erp_detected(1) or erp_detected(2) or
erp_detected(3) or erp_detected(4),
"Some unit turned error passive -> " &
if (erp_detected(1) or erp_detected(2) or
erp_detected(3) or erp_detected(4)) then
error("Some unit turned error passive -> " &
"Most probably traffic consitency check will fail!");
end if;
wait for 100 ns;
end loop;
......@@ -939,7 +940,7 @@ begin
-- Now evaluate the memories content...
check_memories(tx_mems, rx_mems, outcome);
check(outcome, "Traffic consitency check error!");
check(outcome, "Traffic consitency check");
wait for 1000 ns;
loop_ctr <= loop_ctr + 1;
......
......@@ -73,7 +73,7 @@ feature:
iterations: 1
timestamp_registers:
txt_buffer_hazard:
iterations: 20
iterations: 1
reference:
default:
<<: *default
......
......@@ -102,7 +102,7 @@ feature:
iterations: 1
timestamp_registers:
txt_buffer_hazard:
iterations: 10
iterations: 1
sanity:
default:
<<: *default
......
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