summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-12-11 18:09:10 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-12-11 18:09:10 +0000
commit8dafe8c88df357cc1a26a6b565bf9efa625da204 (patch)
treefa8fdd5209bae71052a07f3f9ce488f634b84fde
parenta6455f2994994a44212eeb3693940065c5acbe7f (diff)
test.rb: show messages in one line
* sample/test.rb (Progress#initialize): add --verbose option and show messages in one line unless --verbose is given. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38330 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rwxr-xr-xsample/test.rb8
-rwxr-xr-xtool/rubytest.rb2
3 files changed, 12 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 99d902af457..b1d554293dd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Dec 12 03:09:05 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * sample/test.rb (Progress#initialize): add --verbose option and show
+ messages in one line unless --verbose is given.
+
Wed Dec 12 01:47:02 2012 Shugo Maeda <shugo@ruby-lang.org>
* eval.c (rb_using_refinement): make the method table of an iclass
diff --git a/sample/test.rb b/sample/test.rb
index 26cf0a1d975..e81b9f3bf27 100755
--- a/sample/test.rb
+++ b/sample/test.rb
@@ -8,6 +8,7 @@ class Progress
def initialize
@color = nil
@quiet = nil
+ @verbose = nil
ARGV.each do |arg|
case arg
when /\A--color(?:=(?:always|(auto)|(never)|(.*)))?\z/
@@ -15,9 +16,12 @@ class Progress
@color = $1 ? nil : !$2
when /\A-(q|-quiet)\z/
@quiet = true
+ when /\A-(v|-verbose)\z/
+ @verbose = true
end
end
@tty = STDERR.tty? && !STDOUT.tty? && /dumb/ !~ ENV["TERM"]
+ @eol = @tty && !@verbose ? "\r\e[K\r" : "\n"
case @color
when nil
@color = @tty
@@ -44,9 +48,9 @@ class Progress
end
def finish_string
if @quiet
- "\n"
+ @eol
else
- "#{@passed}#{@ok ? 'OK' : ''} #{$testnum}#{@reset}\n"
+ "#{@passed}#{@ok ? 'OK' : ''} #{$testnum}#{@reset}#{@eol}"
end
end
def pass
diff --git a/tool/rubytest.rb b/tool/rubytest.rb
index 08eada44b8b..a19ce9271a9 100755
--- a/tool/rubytest.rb
+++ b/tool/rubytest.rb
@@ -1,6 +1,6 @@
#! ./miniruby
-exit if defined?(CROSS_COMPILING)
+exit if defined?(CROSS_COMPILING) and CROSS_COMPILING
ruby = ENV["RUBY"]
unless ruby
load './rbconfig.rb'