Martchus
/
cpp-utilities
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix platform check for readFallback...() functions

This commit is contained in:
Martchus 2017-11-01 19:30:55 +01:00
parent 6fd2603cff
commit 924481b033
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
tests/testutils.cpp
View File

@ -398,6 +398,19 @@ int TestApplication::execApp(const char *const *args, string &output, string &er
return execAppInternal(appPath, args, output, errors, suppressLogging, timeout, newProfilingPath); return execAppInternal(appPath, args, output, errors, suppressLogging, timeout, newProfilingPath);
} }
/*!
* \brief Executes an application with the specified \a args.
* \remarks
* - Intended to invoke helper applications (eg. to setup test files). Use execApp() and TestApplication::execApp() to
* invoke the application to be tested itself.
* - Currently only supported under UNIX.
*/
int execHelperApp(const char *appPath, const char *const *args, std::string &output, std::string &errors, bool suppressLogging, int timeout)
{
return execAppInternal(appPath, args, output, errors, suppressLogging, timeout, string());
}
#endif // PLATFORM_UNIX
void TestApplication::readFallbackTestfilePathFromEnv() void TestApplication::readFallbackTestfilePathFromEnv()
{ {
if (const char *testFilesPathEnv = getenv("TEST_FILE_PATH")) { if (const char *testFilesPathEnv = getenv("TEST_FILE_PATH")) {
@ -435,7 +448,7 @@ void TestApplication::readFallbackTestfilePathFromSrcRef()
<< Phrases::End << "Referenced source directory: " << srcDirContent << endl; << Phrases::End << "Referenced source directory: " << srcDirContent << endl;
return; return;
} }
#endif #endif // PLATFORM_UNIX
m_fallbackTestFilesPath = move(srcDirContent); m_fallbackTestFilesPath = move(srcDirContent);
m_fallbackTestFilesPath += "/testfiles/"; m_fallbackTestFilesPath += "/testfiles/";
@ -444,17 +457,4 @@ void TestApplication::readFallbackTestfilePathFromSrcRef()
catchIoFailure(); catchIoFailure();
} }
} }
/*!
* \brief Executes an application with the specified \a args.
* \remarks
* - Intended to invoke helper applications (eg. to setup test files). Use execApp() and TestApplication::execApp() to
* invoke the application to be tested itself.
* - Currently only supported under UNIX.
*/
int execHelperApp(const char *appPath, const char *const *args, std::string &output, std::string &errors, bool suppressLogging, int timeout)
{
return execAppInternal(appPath, args, output, errors, suppressLogging, timeout, string());
}
#endif
} // namespace TestUtilities } // namespace TestUtilities