~mir-team/mir/development-branch

« back to all changes in this revision

Viewing changes to tests/include/mir_test_framework/executable_path.h

merge trunk and resolve conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
26
26
std::string executable_path();
27
27
 
28
28
std::string library_path();
 
29
std::string server_platform(std::string const& name);
 
30
std::string client_platform(std::string const& name);
29
31
}
30
32
#endif /* MIR_TEST_FRAMEWORK_EXECUTABLE_PATH_H_ */