xserver: Branch 'master'

[Michel Dänzer]

On 06.01.2016 04:51, Adam Jackson wrote:
> 
> commit edcb6426f20c3be5dd5f50b76a686754aef2f64e
> Author: Alan Coopersmith <alan.coopersmith at oracle.com>
> Date:   Fri Jan 1 18:11:14 2016 -0800
> 
>     Use unique logfile names when starting server with -displayfd

This change broke make check for me, specifically the signal-logging
test:

(EE) 
Fatal server error:
(EE) Cannot remove old log file "/tmp/Xorg-logging-test.log": No such file or directory
(EE) 
(EE) 
Please consult the The X.Org Foundation support 
	 at http://wiki.x.org
 for help. 
(EE) 

Program received signal SIGSEGV, Segmentation fault.
0x0000000000509983 in SetNotifyFd (fd=0, notify=notify at entry=0x0, mask=mask at entry=0, data=data at entry=0x0) at ../../os/connection.c:1117
1117	        if (n->fd == fd)
(gdb) bt
#0  0x0000000000509983 in SetNotifyFd (fd=0, notify=notify at entry=0x0, mask=mask at entry=0, data=data at entry=0x0) at ../../os/connection.c:1117
#1  0x000000000051163c in RemoveNotifyFd (fd=<optimized out>) at ../../include/os.h:164
#2  teardown () at ../../config/dbus-core.c:86
#3  0x00000000005118aa in dbus_core_fini () at ../../config/dbus-core.c:237
#4  0x0000000000419b5f in ddxGiveUp (error=error at entry=EXIT_ERR_ABORT) at ../../../../hw/xfree86/common/xf86Init.c:1059
#5  0x0000000000419c45 in AbortDDX (error=error at entry=EXIT_ERR_ABORT) at ../../../../hw/xfree86/common/xf86Init.c:1109
#6  0x000000000040e35a in AbortServer () at ../../os/log.c:874
#7  0x000000000040f0d4 in FatalError (f=f at entry=0x5910a0 "Cannot remove old log file \"%s\": %s\n") at ../../os/log.c:1015
#8  0x000000000040f21e in LogFilePrep (fname=<optimized out>, backup=0x0, idstring=0x0) at ../../os/log.c:222
#9  0x000000000040f3b7 in LogInit (fname=fname at entry=0x58b364 "/tmp/Xorg-logging-test.log", backup=backup at entry=0x0) at ../../os/log.c:265
#10 0x000000000040c826 in logging_format () at ../../test/signal-logging.c:179
#11 0x000000000040c6c5 in main (argc=<optimized out>, argv=<optimized out>) at ../../test/signal-logging.c:401


-- 
Earthling Michel Dänzer               |               http://www.amd.com
Libre software enthusiast             |             Mesa and X developer