Skip to content

Detect dual test case run #824

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
std-max wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Detect dual test case run #824

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
46a8e88
Add a testcase for #795
std-max May 10, 2022
bc9f94a
Reset the number of run test cases when test_runner_setup is called
std-max May 10, 2022
cf1ab91
Raise an error when a test case is called twice
std-max May 10, 2022
76907f8
Remove tests that check the ability to re-run a test case (as it is n…
std-max May 31, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions vunit/vhdl/run/src/run.vhd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,8 @@ package body run_pkg is
end if;
end loop;
end if;
set_num_of_run_test_cases(runner_state, 0);

exit_gate(runner);
set_phase(runner_state, test_suite_setup);
notify(runner);
Expand Down Expand Up @@ -234,7 +236,7 @@ package body run_pkg is
if get_test_suite_completed(runner_state) then
set_running_test_case(runner_state, "");
return false;
elsif get_run_all(runner_state) then
elsif get_run_all(runner_state) or get_test_case_name(runner_state, get_active_test_case_index(runner_state)) = name then
if not has_run(name) then
register_run(name);
info(runner_trace_logger, "Test case: " & name);
Expand All @@ -243,14 +245,10 @@ package body run_pkg is
end if;
set_running_test_case(runner_state, name);
return true;
elsif get_test_case_name(runner_state, get_active_test_case_index(runner_state)) = name then
error(runner_trace_logger, "Test case: " & name & " cannot be run more than once.");
return false;
end if;
elsif get_test_case_name(runner_state, get_active_test_case_index(runner_state)) = name then
info(runner_trace_logger, "Test case: " & name);
if has_active_python_runner(runner_state) then
core_pkg.test_start(name);
end if;
set_running_test_case(runner_state, name);
return true;
end if;

set_running_test_case(runner_state, "");
Expand Down
7 changes: 7 additions & 0 deletions vunit/vhdl/run/src/runner_pkg.vhd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,8 @@ package runner_pkg is

procedure inc_num_of_run_test_cases(runner : runner_t);

procedure set_num_of_run_test_cases(runner : runner_t; new_value : integer);

procedure set_has_run_since_last_loop_check(runner : runner_t);

procedure clear_has_run_since_last_loop_check(runner : runner_t);
Expand Down Expand Up @@ -425,6 +427,11 @@ package body runner_pkg is
set(runner.p_data, n_run_test_cases_idx, get_num_of_run_test_cases(runner) + 1);
end;

procedure set_num_of_run_test_cases(runner : runner_t; new_value : integer) is
begin
set(runner.p_data, n_run_test_cases_idx, new_value);
end;

procedure set_has_run_since_last_loop_check(runner : runner_t) is
begin
set(runner.p_data, has_run_since_last_loop_check_idx, to_integer(true));
Expand Down
20 changes: 20 additions & 0 deletions vunit/vhdl/run/test/run_tests.vhd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -467,6 +467,26 @@ begin

test_case_cleanup;

---------------------------------------------------------------------------
banner("Should prevent from running a test from enabled_test_case more than once.");
test_case_setup;
test_runner_setup(runner, "enabled_test_cases : Should one");
while test_suite loop
for i in 0 to 2 loop
case i is
when 0 =>
check(c, run("Should one"), "Expected ""Should one"" to run.");
when others =>
mock(runner_trace_logger);
check_false(c, run("Should one"), "Didn't expected ""Should one"" to run.");
check_log(runner_trace_logger, "Test case: Should one cannot be run more than once.", error);
unmock(runner_trace_logger);
end case;
end loop;
end loop;

test_case_cleanup;

---------------------------------------------------------------------------
--banner("Should be possible to exit a test case or test suite with an error message that can be caught afterwards.");
--test_case_setup;
Expand Down