1.1 --- a/test/script/currently-failing/logcoverage.js Tue Aug 19 20:43:03 2014 +0100
1.2 +++ b/test/script/currently-failing/logcoverage.js Wed Aug 20 10:25:28 2014 +0200
1.3 @@ -1,21 +1,21 @@
1.4 /*
1.5 * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
1.6 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.7 - *
1.8 + *
1.9 * This code is free software; you can redistribute it and/or modify it
1.10 * under the terms of the GNU General Public License version 2 only, as
1.11 * published by the Free Software Foundation.
1.12 - *
1.13 + *
1.14 * This code is distributed in the hope that it will be useful, but WITHOUT
1.15 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
1.16 * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
1.17 * version 2 for more details (a copy is included in the LICENSE file that
1.18 * accompanied this code).
1.19 - *
1.20 + *
1.21 * You should have received a copy of the GNU General Public License version
1.22 * 2 along with this work; if not, write to the Free Software Foundation,
1.23 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
1.24 - *
1.25 + *
1.26 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
1.27 * or visit www.oracle.com if you need additional information or have any
1.28 * questions.
1.29 @@ -23,7 +23,7 @@
1.30
1.31 /**
1.32 * mh_coverage.js
1.33 - * Screen scrape various logs to ensure that we cover enough functionality,
1.34 + * Screen scrape various logs to ensure that we cover enough functionality,
1.35 * e.g. method handle instrumentation
1.36 *
1.37 * @test
1.38 @@ -44,25 +44,25 @@
1.39 var fac = new NashornScriptEngineFactory();
1.40 // get current System.err
1.41 var oldErr = System.err;
1.42 - var oldOut = System.out;
1.43 + var oldOut = System.out;
1.44 var baosErr = new ByteArrayOutputStream();
1.45 var newErr = new PrintStream(baosErr);
1.46 var baosOut = new ByteArrayOutputStream();
1.47 - var newOut = new PrintStream(baosOut);
1.48 + var newOut = new PrintStream(baosOut);
1.49 try {
1.50 // set new standard err
1.51 System.setErr(newErr);
1.52 System.setOut(newOut);
1.53 var engine = fac.getScriptEngine(Java.to(opts, "java.lang.String[]"));
1.54 - var reader = new java.io.FileReader(name);
1.55 + var reader = new java.io.FileReader(name);
1.56 engine.eval(reader);
1.57 newErr.flush();
1.58 - newOut.flush();
1.59 + newOut.flush();
1.60 return new java.lang.String(baosErr.toByteArray());
1.61 } finally {
1.62 // restore System.err to old value
1.63 System.setErr(oldErr);
1.64 - System.setOut(oldOut);
1.65 + System.setOut(oldOut);
1.66 }
1.67 }
1.68 }
1.69 @@ -70,27 +70,27 @@
1.70 var str;
1.71
1.72 var methodsCalled = [
1.73 - 'asCollector',
1.74 - 'asType',
1.75 - 'bindTo',
1.76 - 'dropArguments',
1.77 - 'explicitCastArguments',
1.78 - 'filterArguments',
1.79 - 'filterReturnValue',
1.80 - 'findStatic',
1.81 - 'findVirtual',
1.82 - 'foldArguments',
1.83 - 'getter',
1.84 - 'guardWithTest',
1.85 - 'insertArguments',
1.86 - 'methodType',
1.87 + 'asCollector',
1.88 + 'asType',
1.89 + 'bindTo',
1.90 + 'dropArguments',
1.91 + 'explicitCastArguments',
1.92 + 'filterArguments',
1.93 + 'filterReturnValue',
1.94 + 'findStatic',
1.95 + 'findVirtual',
1.96 + 'foldArguments',
1.97 + 'getter',
1.98 + 'guardWithTest',
1.99 + 'insertArguments',
1.100 + 'methodType',
1.101 'setter'
1.102 ];
1.103
1.104 function check(str, strs) {
1.105 for each (s in strs) {
1.106 if (str.indexOf(s) !== -1) {
1.107 - continue;
1.108 + continue;
1.109 }
1.110 print(s + " not found");
1.111 return;
