From eea1895cf20621300ae48f04b61c656f0f1c45ef Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 7 Mar 2016 19:39:32 +0000
Subject: test_rubyoptions.rb: fix test

* test/ruby/test_rubyoptions.rb (test_shebang): adjust only
  expected stderr as a warning, assertion has meaning on all
  platforms.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54024 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ruby.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'ruby.c')

diff --git a/ruby.c b/ruby.c
index bbf2fdb762..bf71a288d4 100644
--- a/ruby.c
+++ b/ruby.c
@@ -1676,6 +1676,8 @@ warn_cr_in_shebang(const char *str, long len)
 	rb_warn("shebang line ends with \\r may cause a problem");
     }
 }
+#else
+#define warn_cr_in_shebang(str, len) (void)0
 #endif
 
 struct load_file_arg {
@@ -1725,9 +1727,7 @@ load_file_internal(VALUE argp_v)
 		line_start++;
 		RSTRING_GETMEM(line, str, len);
 		if (len > 2 && str[0] == '#' && str[1] == '!') {
-#ifndef DOSISH
 		    if (line_start == 1) warn_cr_in_shebang(str, len);
-#endif
 		    if ((p = strstr(str+2, ruby_engine)) != 0) {
 			goto start_read;
 		    }
@@ -1745,9 +1745,7 @@ load_file_internal(VALUE argp_v)
 		    return 0;
 
 		RSTRING_GETMEM(line, str, len);
-#ifndef DOSISH
 		warn_cr_in_shebang(str, len);
-#endif
 		if ((p = strstr(str, ruby_engine)) == 0) {
 		    /* not ruby script, assume -x flag */
 		    goto search_shebang;
-- 
cgit v1.2.3