summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-01-31 19:01:50 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-01-31 19:01:50 +0000
commit8bc9c80bcb23d69263437c1a298f8cbc722017f5 (patch)
treea71bad0e557faadf892cded6199719cf66d443b5
parent766c3744f48e69461db09942bfe02790753ead40 (diff)
merge revision(s) 53727: [Backport #14428]
Remove debug print introduced in r52386 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@62148 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--test/ruby/test_gc.rb7
-rw-r--r--version.h8
3 files changed, 8 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index 792438da4c..163c685140 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Feb 1 04:00:53 2018 NARUSE, Yui <naruse@ruby-lang.org>
+
+ Remove debug print introduced in r52386
+
Wed Jan 31 22:57:42 2018 Nobuyoshi Nakada <nobu@ruby-lang.org>
configure.in: link Foundation framework
diff --git a/test/ruby/test_gc.rb b/test/ruby/test_gc.rb
index 51b17c6f82..ba4709e395 100644
--- a/test/ruby/test_gc.rb
+++ b/test/ruby/test_gc.rb
@@ -342,13 +342,6 @@ class TestGc < Test::Unit::TestCase
sleep 0.1
Process.kill("INT", pid) rescue break
}
- if RUBY_PLATFORM.include?('solaris')
- $stderr.puts `/usr/bin/psig #{$$}`
- $stderr.puts `/usr/bin/psig #{Process.ppid}`
- elsif File.exist?('/proc/self/status')
- $stderr.puts IO.read('/proc/self/status')
- $stderr.puts IO.read("/proc/#{Process.ppid}/status")
- end
end
f = proc {1000.times {}}
loop do
diff --git a/version.h b/version.h
index 1999219065..c428cffe49 100644
--- a/version.h
+++ b/version.h
@@ -1,10 +1,10 @@
#define RUBY_VERSION "2.3.7"
-#define RUBY_RELEASE_DATE "2018-01-31"
-#define RUBY_PATCHLEVEL 406
+#define RUBY_RELEASE_DATE "2018-02-01"
+#define RUBY_PATCHLEVEL 407
#define RUBY_RELEASE_YEAR 2018
-#define RUBY_RELEASE_MONTH 1
-#define RUBY_RELEASE_DAY 31
+#define RUBY_RELEASE_MONTH 2
+#define RUBY_RELEASE_DAY 1
#include "ruby/version.h"