From 0e2d2e6a794d3e9e6a55be37b9b640c902bc501b Mon Sep 17 00:00:00 2001 From: hsbt Date: Mon, 23 Oct 2017 05:56:25 +0000 Subject: Drop to support NaCl platform. Because NaCl and PNaCl are already sunset status. see https://bugs.chromium.org/p/chromium/issues/detail?id=239656#c160 configure.ac: Patch for this file was provided by @nobu. [Feature #14041][ruby-core:83497][fix GH-1726] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60374 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- bootstraptest/runner.rb | 6 ------ bootstraptest/test_io.rb | 4 ++-- bootstraptest/test_literal.rb | 6 ++---- 3 files changed, 4 insertions(+), 12 deletions(-) (limited to 'bootstraptest') diff --git a/bootstraptest/runner.rb b/bootstraptest/runner.rb index a2b6fadaf4..6a4d4c99a1 100755 --- a/bootstraptest/runner.rb +++ b/bootstraptest/runner.rb @@ -261,12 +261,6 @@ rescue Exception => err error err.message, message end -# NativeClient is special. The binary is cross-compiled. But runs on the build environment. -# So RUBY_PLATFORM in this process is not useful to detect it. -def nacl? - @ruby and File.basename(@ruby.split(/\s/).first)['sel_ldr'] -end - def assert_check(testsrc, message = '', opt = '', **argh) show_progress(message) { result = get_result_string(testsrc, opt, **argh) diff --git a/bootstraptest/test_io.rb b/bootstraptest/test_io.rb index 1d2b19368a..89c00d0b88 100644 --- a/bootstraptest/test_io.rb +++ b/bootstraptest/test_io.rb @@ -52,7 +52,7 @@ assert_equal 'ok', %q{ STDIN.reopen(rw) STDIN.reopen(save) rw.close - File.unlink(tmpname) unless RUBY_PLATFORM['nacl'] + File.unlink(tmpname) :ok } @@ -69,7 +69,7 @@ assert_equal 'ok', %q{ STDIN.print "a" STDIN.reopen(save) rw.close - File.unlink(tmpname) unless RUBY_PLATFORM['nacl'] + File.unlink(tmpname) :ok } diff --git a/bootstraptest/test_literal.rb b/bootstraptest/test_literal.rb index e79092e411..0c5102c46e 100644 --- a/bootstraptest/test_literal.rb +++ b/bootstraptest/test_literal.rb @@ -65,10 +65,8 @@ assert_equal ':a3c', ':"a#{1+2}c".inspect' assert_equal 'Symbol', ':"a#{1+2}c".class' # xstring -unless nacl? - assert_equal "foo\n", %q(`echo foo`) - assert_equal "foo\n", %q(s = "foo"; `echo #{s}`) -end +assert_equal "foo\n", %q(`echo foo`) +assert_equal "foo\n", %q(s = "foo"; `echo #{s}`) # regexp assert_equal '', '//.source' -- cgit v1.2.3