diff options
| author | odaira <odaira@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-10-04 07:35:43 +0000 |
|---|---|---|
| committer | odaira <odaira@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-10-04 07:35:43 +0000 |
| commit | 11ad7c4dbe323de89695ac6cf107d3094174e16f (patch) | |
| tree | 23de7cd8ea8e4e7a46ddaf02ef84f86ff35169cb | |
| parent | bebb4e9deab9723208cccaec5d3124324bbf80b8 (diff) | |
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
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | test/test_syslog.rb | 8 |
2 files changed, 14 insertions, 0 deletions
@@ -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): diff --git a/test/test_syslog.rb b/test/test_syslog.rb index 05d85981a3..3164d079fc 100644 --- a/test/test_syslog.rb +++ b/test/test_syslog.rb @@ -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]) |