summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzegorz@gitlab.com>2017-07-22 05:19:02 +0000
committerJose Ivan Vargas <jvargas@gitlab.com>2017-07-24 11:31:04 -0500
commite696e8426c4d31a190782967b14a384f7da8d4b1 (patch)
tree5acf52cfa7f9473d7e07c8cb957a79d04caa0806 /lib
parent1b24cb18359a8969f57067d61f59dad5375ff539 (diff)
downloadgitlab-ce-e696e8426c4d31a190782967b14a384f7da8d4b1.tar.gz
Merge branch '35368-fix-gcovr-regexp-matching' into 'master'
Fix the gcovr coverage regex by removing line separators before scanning Closes #35368 See merge request !13025
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/ci/trace/stream.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/gitlab/ci/trace/stream.rb b/lib/gitlab/ci/trace/stream.rb
index 5d6977106d6..aaba034474c 100644
--- a/lib/gitlab/ci/trace/stream.rb
+++ b/lib/gitlab/ci/trace/stream.rb
@@ -74,6 +74,7 @@ module Gitlab
match = ""
reverse_line do |line|
+ line.chomp!
matches = regex.scan(line)
next unless matches.is_a?(Array)
next if matches.empty?