X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/546ff9a19e17c60209ab2cdc814ff9fb85a19342..85241a924:/src/settings/services/test/test_helper.rb diff --git a/src/settings/services/test/test_helper.rb b/src/settings/services/test/test_helper.rb index 9da5cf3c3..35b5d19eb 100644 --- a/src/settings/services/test/test_helper.rb +++ b/src/settings/services/test/test_helper.rb @@ -15,41 +15,6 @@ # Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -GLOBAL_COVERAGE_ROOT = File.dirname(__dir__) # ../ - -# Simplecov is a bit meh and expects src and coverage to be under the -# same root. Since we get run through cmake that assumption absolutely -# doesn't hold true, so we'll need to figure out the coverage_dir relative -# to the root and the root must always be the source :/ -# The relativity only works because internally the path gets expanded, this -# isn't fully reliable, but oh well... -# https://github.com/colszowka/simplecov/issues/716 -GLOBAL_COVERAGE_DIR = begin - require 'pathname' - src_path = Pathname.new(GLOBAL_COVERAGE_ROOT) - coverage_path = Pathname.new(File.join(Dir.pwd, 'coverage')) - coverage_path.relative_path_from(src_path).to_s -end - -begin - require 'simplecov' - - SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new( - [ - SimpleCov::Formatter::HTMLFormatter - ] - ) - - SimpleCov.start do - root GLOBAL_COVERAGE_ROOT - coverage_dir GLOBAL_COVERAGE_DIR - end -rescue LoadError - warn 'SimpleCov not loaded' -end - -# FIXME: add coverage report for jenkins? - $LOAD_PATH.unshift(File.absolute_path('../', __dir__)) # ../ def __test_method_name__ @@ -63,38 +28,4 @@ def __test_method_name__ caller end -# system() variant which sets up merge-coverage. simplecov supports merging -# of multiple coverage sets. we use this to get coverage metrics on the -# binaries without having to refactor the script into runnable classes. -def covered_system(cmd, *argv) - pid = fork do - Kernel.module_exec do - alias_method(:real_system, :system) - define_method(:system) do |*args| - return true if args.include?('kdialog') # disable kdialog call - real_system(*args) - end - end - - begin - require 'simplecov' - SimpleCov.start do - root GLOBAL_COVERAGE_ROOT - coverage_dir GLOBAL_COVERAGE_DIR - command_name "#{cmd}_#{__test_method_name__}" - end - rescue LoadError - warn 'SimpleCov not loaded' - end - - ARGV.replace(argv) - load "#{__dir__}/../#{cmd}" - puts 'all good, fork ending!' - exit 0 - end - waitedpid, status = Process.waitpid2(pid) - assert_equal(pid, waitedpid) - status.success? # behave like system and return the success only -end - require 'test/unit'