Commit 09b512ff authored by Ben Cooksley's avatar Ben Cooksley

Be a bit more safe around os.remove

Ref T9087
parent 081ce1c4
......@@ -83,8 +83,10 @@ buildEnvironment['CTEST_OUTPUT_ON_FAILURE'] = '1'
# Cleanup the builder if needed
if sys.platform == 'freebsd11':
subprocess.call("killall -9 dbus-daemon kded5 kioslave klauncher kdeinit5 kiod openbox Xvfb", shell=True)
os.remove('/tmp/.X90-lock')
os.remove('/tmp/.X11-unix/X90')
if os.path.exists('/tmp/.X90-lock'):
os.remove('/tmp/.X90-lock')
if os.path.exists('/tmp/.X11-unix/X90'):
os.remove('/tmp/.X11-unix/X90')
# Spawn a X windowing system if needed
# We'll also launch a Window Manager at the same time as some tests often need or unknowingly rely on one being present
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment