зеркало из https://github.com/github/ruby.git
test/test_syslog.rb (TestSyslog#test_log): In AIX, each output line of LOG_PERROR to stderr has an additional empty line appended, so skip that line.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47786 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
Родитель
bebb4e9dea
Коммит
11ad7c4dbe
|
@ -1,3 +1,9 @@
|
|||
Sat Oct 4 16:24:41 2014 Rei Odaira <Rei.Odaira@gmail.com>
|
||||
|
||||
* test/test_syslog.rb (TestSyslog#test_log): In AIX, each output
|
||||
line of LOG_PERROR to stderr has an additional empty line appended,
|
||||
so skip that line.
|
||||
|
||||
Sat Oct 4 16:05:49 2014 Rei Odaira <Rei.Odaira@gmail.com>
|
||||
|
||||
* test/socket/test_unix.rb (TestSocket_UNIXSocket#test_too_long_path):
|
||||
|
|
|
@ -146,6 +146,10 @@ class TestSyslog < Test::Unit::TestCase
|
|||
2.times {
|
||||
re = syslog_line_regex("syslog_test", "test1 - hello, world!")
|
||||
line = stderr[0].gets
|
||||
# In AIX, each LOG_PERROR output line has an appended empty line.
|
||||
if /aix/ =~ RUBY_PLATFORM && line =~ /^$/
|
||||
line = stderr[0].gets
|
||||
end
|
||||
m = re.match(line)
|
||||
assert_not_nil(m)
|
||||
if m[1]
|
||||
|
@ -157,6 +161,10 @@ class TestSyslog < Test::Unit::TestCase
|
|||
2.times {
|
||||
re = syslog_line_regex("syslog_test", "test2 - pid")
|
||||
line = stderr[0].gets
|
||||
# In AIX, each LOG_PERROR output line has an appended empty line.
|
||||
if /aix/ =~ RUBY_PLATFORM && line =~ /^$/
|
||||
line = stderr[0].gets
|
||||
end
|
||||
m = re.match(line)
|
||||
assert_not_nil(m)
|
||||
assert_not_nil(m[1])
|
||||
|
|
Загрузка…
Ссылка в новой задаче