Members of the KDE Community are recommended to subscribe to the kde-community mailing list at https://mail.kde.org/mailman/listinfo/kde-community to allow them to participate in important discussions and receive other important announcements

Commit 1e42adf7 authored by Harald Sitter's avatar Harald Sitter 🌼

do not try to isolate x11 on build.kde

it manages its own x11 and attempts to isolate yourself is an endless waste
of time of issues
parent 4cc63ecd
......@@ -50,6 +50,19 @@ class XvfbIsolator
end
end
class NoIsolator
def run(cmd)
warn cmd.to_s
system(cmd) || raise
end
end
def isolator
return NoIsolator.new if ENV['JENKINS_SERVER_COOKIE'] || ENV['NO_ISOLATOR']
return XephyrIsolator.new if ENV['XEPHYR']
XvfbIsolator.new
end
OptionParser.new do |opts|
opts.banner = "Usage: #{$0} ARGS"
......@@ -75,7 +88,6 @@ Dir.mktmpdir do |tmpdir|
ENV['HOME'] = tmpdir
ENV.keys.each { |k| ENV.delete(k) if k.start_with?('XDG_') }
Dir.glob("#{__dir__}/*_test.rb").each do |test|
isolator = ENV['XEPHYR'] ? XephyrIsolator.new : XvfbIsolator.new
isolator.run("dbus-run-session -- ruby '#{test}' -p")
end
sleep 2 # Wait a bit to make sure all children are dead.
......
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