Skip to content
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

[RX] fix windows huge page support #2624

Merged
merged 1 commit into from
Dec 10, 2019
Merged

[RX] fix windows huge page support #2624

Show file tree
Hide file tree
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
6 changes: 6 additions & 0 deletions xmrstak/backend/cpu/minethd.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,6 +260,12 @@ bool minethd::self_test()
if(res == 0 && fatal)
return false;

if(!params::inst().selfTest)
{
printer::inst()->print_msg(L0, "skip self test: disabled by the command line option '--noTest')");
return true;
}

cryptonight_ctx* ctx[MAX_N] = {0};
for(int i = 0; i < MAX_N; i++)
{
Expand Down
11 changes: 4 additions & 7 deletions xmrstak/cli/cli-miner.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -848,14 +848,11 @@ int main(int argc, char* argv[])
if(strlen(jconf::inst()->GetOutputFile()) != 0)
printer::inst()->open_logfile(jconf::inst()->GetOutputFile());

if(params::inst().selfTest)
if(!BackendConnector::self_test())
{
if(!BackendConnector::self_test())
{
printer::inst()->print_msg(L0, "Self test not passed!");
win_exit();
return 1;
}
printer::inst()->print_msg(L0, "Self test not passed!");
win_exit();
return 1;
}

if(jconf::inst()->GetHttpdPort() != uint16_t(params::httpd_port_disabled))
Expand Down