[PATCH xorg-gtest 1/2] Print the display we were trying to start up on.

Chase Douglas chase.douglas at canonical.com
Fri May 25 07:47:30 PDT 2012


On 05/24/2012 06:57 PM, Peter Hutterer wrote:
> Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
> ---
>  src/environment.cpp |    6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/src/environment.cpp b/src/environment.cpp
> index 38765ac..9e58e4a 100644
> --- a/src/environment.cpp
> +++ b/src/environment.cpp
> @@ -124,8 +124,10 @@ void xorg::testing::Environment::SetUp() {
>      int pid = waitpid(d_->process.Pid(), &status, WNOHANG);
>      if (pid == d_->process.Pid()) {
>        std::string message;
> -      message += "X server failed to start. Ensure that the \"dummy\" video "
> -                 "driver is installed. If the X.org server is older than 1.12, "
> +      message += "X server failed to start on display ";
> +      message += display_string;
> +      message += ". Ensure that the \"dummy\" video driver is installed. "
> +                 "If the X.org server is older than 1.12, "
>                   "tests will need to be run as root. Check ";
>        message += d_->path_to_log_file;
>        message += " for any errors";

Reviewed-by: Chase Douglas <chase.douglas at canonical.com>

And pushed.

Thanks!


More information about the xorg-devel mailing list