Add latest changes from gitlab-org/gitlab@15-7-stable-eev15.7.0-rc42

1 files changed, 8 insertions, 1 deletions

diff --git a/scripts/undercoverage b/scripts/undercoverage
index 86153671d6a..348f421c0d5 100755
--- a/scripts/undercoverage
+++ b/scripts/undercoverage
@@ -21,6 +21,13 @@ end
 
 compare_base = ARGV[0]
 compare_base ||= IO.popen(%w(git merge-base origin/master HEAD)) { |p| p.read.chomp }
+coverage_file_path = 'coverage/lcov/gitlab.lcov'
+
+result = if File.exist?(coverage_file_path)
+           Undercover::CLI.run(%W(-c #{compare_base}))
+         else
+           warn "#{coverage_file_path} doesn't exist"
+           0
+         end
 
-result = Undercover::CLI.run(%W(-c #{compare_base}))
 exit result