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

2012-07-03 Thread Peter Hutterer
Signed-off-by: Peter Hutterer peter.hutte...@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

___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel


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

2012-07-03 Thread Chase Douglas

On 07/02/2012 11:44 PM, Peter Hutterer wrote:

Signed-off-by: Peter Hutterer peter.hutte...@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


If we're going to do this, then we might as well just get rid of 
SetLogFilePath() and SetConfigPath().


I commented about this block not being necessary in a previous patch, so 
I'm going to give a tentative Reviewed-by in case I'm proven wrong :).


Reviewed-by: Chase Douglas chase.doug...@canonical.com
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel