[PATCH xorg-gtest] xserver: check for old log file, not old config file

Chase Douglas chase.douglas at canonical.com
Wed Jul 25 11:46:35 PDT 2012


On 07/24/2012 05:34 PM, Chase Douglas wrote:
> On 07/24/2012 05:05 PM, Peter Hutterer wrote:
>> Introduced in cf9c6a9f588390869f278e5620ec40bfa2859d6a
>>
>> Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
>> ---
>>    src/xserver.cpp |    2 +-
>>    1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/src/xserver.cpp b/src/xserver.cpp
>> index 101c859..b420dd1 100644
>> --- a/src/xserver.cpp
>> +++ b/src/xserver.cpp
>> @@ -272,7 +272,7 @@ void xorg::testing::XServer::TestStartup(void) {
>>        throw std::runtime_error(message);
>>      }
>>
>> -  std::string old_log_file = d_->options["-config"];
>> +  std::string old_log_file = d_->options["-logfile"];
>>      old_log_file += ".old";
>>      log_test.open(old_log_file.c_str(), std::ofstream::out);
>>      log_test.close();
>
> Pretty obvious :).
>
> Reviewed-by: Chase Douglas <chase.douglas at canonical.com>
>
> I'll merge this in tomorrow, and then make a release.

Pushed as commit 4cce47f6610fcb77c34f97dbcf17ebd50e5ba49a.

I have four patches I'm about to send out for fixes found by running 
'make distcheck'. Once those are reviewed and merged, I'll make a release.

-- Chase


More information about the xorg-devel mailing list