merge revision(s) c6633f21a49c90ab7c37076d79c286bbf3438c1f:

	Update some syslog tests to absurb the format change of FreeBSD
	 syslog

	FreeBSD

	```
	$ ruby -rsyslog -e 'Syslog.open("rubyspec", Syslog::LOG_PERROR) {|s| s.log(Syslog::LOG_ALERT, "Hello") }'
	rubyspec 78462 - - Hello
	```

	Linux

	```
	$ ruby -rsyslog -e 'Syslog.open("rubyspec", Syslog::LOG_PERROR) {|s| s.log(Syslog::LOG_ALERT, "Hello") }'
	rubyspec: Hello
	```

	https://github.com/freebsd/freebsd/commit/591ef7c8076109cff3c41f9bb50da996a34121e9

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_6@67857 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 6 insertions, 6 deletions

diff --git a/spec/ruby/library/syslog/log_spec.rb b/spec/ruby/library/syslog/log_spec.rb
index f92f69ea92..11b0e053b1 100644
--- a/spec/ruby/library/syslog/log_spec.rb
+++ b/spec/ruby/library/syslog/log_spec.rb
@@ -20,7 +20,7 @@ platform_is_not :windows do
             s.log(Syslog::LOG_ALERT, "Hello")
             s.log(Syslog::LOG_CRIT, "World")
           end
-        }.should output_to_fd("rubyspec: Hello\nrubyspec: World\n", $stderr)
+        }.should output_to_fd(/\Arubyspec(?::| \d+ - -) Hello\nrubyspec(?::| \d+ - -) World\n\z/, $stderr)
       end
 
       it "accepts undefined priorites" do
@@ -29,7 +29,7 @@ platform_is_not :windows do
             s.log(1337, "Hello")
           end
           # use a regex since it'll output unknown facility/priority messages
-        }.should output_to_fd(/rubyspec: Hello/, $stderr)
+        }.should output_to_fd(/rubyspec(?::| \d+ - -) Hello\n\z/, $stderr)
       end
 
       it "fails with TypeError on nil log messages" do
@@ -49,7 +49,7 @@ platform_is_not :windows do
           Syslog.open("rubyspec", Syslog::LOG_PERROR) do |s|
             s.log(Syslog::LOG_ALERT, "%s x %d", "chunky bacon", 2)
           end
-        }.should output_to_fd("rubyspec: chunky bacon x 2\n", $stderr)
+        }.should output_to_fd(/rubyspec(?::| \d+ - -) chunky bacon x 2\n\z/, $stderr)
       end
     end
   end
diff --git a/spec/ruby/library/syslog/shared/log.rb b/spec/ruby/library/syslog/shared/log.rb
index 6d0d3a3c23..b8b812a13c 100644
--- a/spec/ruby/library/syslog/shared/log.rb
+++ b/spec/ruby/library/syslog/shared/log.rb
@@ -13,7 +13,7 @@ describe :syslog_log, shared: true do
         Syslog.open("rubyspec", Syslog::LOG_PERROR) do
           Syslog.send(@method, "Hello")
         end
-      }.should output_to_fd("rubyspec: Hello\n", $stderr)
+      }.should output_to_fd(/\Arubyspec(?::| \d+ - -) Hello\n\z/, $stderr)
     end
 
     it "accepts sprintf arguments" do
@@ -22,7 +22,7 @@ describe :syslog_log, shared: true do
           Syslog.send(@method, "Hello %s", "world")
           Syslog.send(@method, "%d dogs", 2)
         end
-      }.should output_to_fd("rubyspec: Hello world\nrubyspec: 2 dogs\n", $stderr)
+      }.should output_to_fd(/\Arubyspec(?::| \d+ - -) Hello world\nrubyspec(?::| \d+ - -) 2 dogs\n\z/, $stderr)
     end
 
     it "works as an alias for Syslog.log" do
@@ -34,7 +34,7 @@ describe :syslog_log, shared: true do
           Syslog.log(level, "Hello")
         end
         # make sure the same thing is written to $stderr.
-      }.should output_to_fd(response * 2, $stderr)
+      }.should output_to_fd(/\A(?:rubyspec(?::| \d+ - -) Hello\n){2}\z/, $stderr)
     end
   end
 end