[PATCH xorg-gtest 11/16] environment: use SetOption, instead of separate calls

Peter Hutterer peter.hutterer at who-t.net
Mon Jul 2 23:44:52 PDT 2012


Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
 src/environment.cpp |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/environment.cpp b/src/environment.cpp
index 01b2148..f28bec4 100644
--- a/src/environment.cpp
+++ b/src/environment.cpp
@@ -106,9 +106,9 @@ void xorg::testing::Environment::SetUp() {
   if (d_->display >= 0)
     d_->server.SetDisplayNumber(d_->display);
   if (d_->path_to_log_file.length())
-    d_->server.SetLogfilePath(d_->path_to_log_file);
+    d_->server.SetOption("-logfile", d_->path_to_log_file);
   if (d_->path_to_conf.length())
-    d_->server.SetConfigPath(d_->path_to_conf);
+    d_->server.SetOption("-config", d_->path_to_log_file);
   if (d_->path_to_server.length())
     display_used = d_->server.Start(d_->path_to_server);
   else
-- 
1.7.10.4



More information about the xorg-devel mailing list