summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--test/test_syslog.rb8
2 files changed, 14 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 19d1b06debc..4d5a640c94b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 05d85981a3a..3164d079fc0 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])