Skip to content
This repository was archived by the owner on Oct 12, 2022. It is now read-only.
/ druntime Public archive

Fix test coverage merging with the test_runner #1629

Merged
MartinNowak merged 1 commit into from
Aug 12, 2016
Merged

Fix test coverage merging with the test_runner #1629

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions src/test_runner.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,11 @@ void doTest(ModuleInfo* moduleInfo, ref bool ret)

shared static this()
{
version(D_Coverage)
{
import core.runtime : dmd_coverSetMerge;
dmd_coverSetMerge(true);
}
Runtime.moduleUnitTester = &tester;

debug mode = "debug";
Expand All @@ -85,9 +90,4 @@ shared static this()

void main()
Copy link
Member

@MartinNowak MartinNowak Aug 12, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well, this has always been wrong anyhow, b/c unittests are run from the runtime initialization before entering main.

{
version(D_Coverage)
{
import core.runtime : dmd_coverSetMerge;
dmd_coverSetMerge(true);
}
}