diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2012-06-27 16:07:15 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2012-07-12 15:10:42 +1000 |
| commit | b0417d54245d97fa08f5e8b7c2669f2f4b28ba64 (patch) | |
| tree | ab44a84199a5f85eda725a205bea84070097584c /include | |
| parent | d5e07ba3f95a64472e9df52fc1c7efc20c5ead4a (diff) | |
xserver: store config, logfile, binary paths in the XServer object
And provide a SetOption call for the various commandline options that the
server may take.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/xorg/gtest/xorg-gtest-xserver.h | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/include/xorg/gtest/xorg-gtest-xserver.h b/include/xorg/gtest/xorg-gtest-xserver.h index e717039..569387b 100644 --- a/include/xorg/gtest/xorg-gtest-xserver.h +++ b/include/xorg/gtest/xorg-gtest-xserver.h @@ -56,6 +56,14 @@ class XServer : public xorg::testing::Process { void SetDisplayNumber(unsigned int display_number); /** + * Set the path to the server binary to be started. Optional call, if + * not invoked the built-in default path is chosen. + * + * @param [in] path_to_server The path to the binary + */ + void SetServerPath(const std::string &path_to_server); + + /** * Get the display number from this server. If the server was not * started yet, this function returns the display number the server will * be started on. @@ -73,6 +81,17 @@ class XServer : public xorg::testing::Process { const std::string& GetDisplayString(void); /** + * Set startup options for the server. + * + * For arguments that do not take/need a value, use the empty string as + * value. + * + * @param [in] key Commandline option + * @param [in] value Option value (if any) + */ + void SetOption(const std::string &key, const std::string &value); + + /** * Wait for a specific device to be added to the server. * * @param [in] display The X display connection |