F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

core: fix output redirection in example-as-test

Browse Source
This commit is contained in:
Peter D. Barnes, Jr
2023-01-20 14:12:22 -08:00
committed by Peter Barnes
parent 7b7b3c10b7
commit 63912dfc4a
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/core/model/example-as-test.cc
View File

@@ -85,18 +85,22 @@ ExampleAsTestCase::DoRun()
SetDataDir(m_dataDir);
std::string refFile = CreateDataDirFilename(GetName() + ".reflog");
std::string testFile = CreateTempDirFilename(GetName() + ".reflog");
std::string post = GetPostProcessingCommand();
std::stringstream ss;
ss << "python3 ./ns3 run " << m_program << " --no-build --command-template=\""
<< GetCommandTemplate()
<< "\""
<< GetCommandTemplate() << "\"";
// redirect std::clog, std::cerr to std::cout
<< " 2>&1 "
// Suppress the waf lines from output; waf output contains directory paths which will
// obviously differ during a test run
<< " " << GetPostProcessingCommand() << " > " << testFile;
if (post.empty())
{
// redirect to testfile, then std::clog, std::cerr to std::cout
ss << " > " << testFile << " 2>&1";
}
else
{
ss << " 2>&1 " << post << " > " << testFile;
}
int status = std::system(ss.str().c_str());