# HG changeset patch # User sundar # Date 1506351764 -19800 # Node ID ae970828ec0c65da0c81252d416504521ca86106 # Parent be020513a185508a74bd34384f2b4d7383644152 8187934: dropping a shebang script in src/sample/nashorn directory results in test failure Reviewed-by: hannesw, jlaskey diff -r be020513a185 -r ae970828ec0c src/sample/nashorn/pgrep.js --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/sample/nashorn/pgrep.js Mon Sep 25 20:32:44 2017 +0530 @@ -0,0 +1,42 @@ +#!/usr/bin/jjs --language=es6 + +/* + * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * - Neither the name of Oracle nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS + * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, + * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +// simple process grep tool + +java.lang.ProcessHandle. + allProcesses(). + filter(ph => { + var cmd = ph.info().commandLine(); + return cmd.isPresent() && cmd.get().search(arguments[0]) != -1; + }). + forEach(ph => print(ph.pid() + " " + ph.info().commandLine().get())); diff -r be020513a185 -r ae970828ec0c test/nashorn/src/jdk/nashorn/internal/codegen/test/CompilerTest.java --- a/test/nashorn/src/jdk/nashorn/internal/codegen/test/CompilerTest.java Tue Sep 26 00:37:37 2017 +0530 +++ b/test/nashorn/src/jdk/nashorn/internal/codegen/test/CompilerTest.java Mon Sep 25 20:32:44 2017 +0530 @@ -49,7 +49,6 @@ private static final boolean VERBOSE = Boolean.valueOf(System.getProperty("compilertest.verbose")); private static final boolean TEST262 = Boolean.valueOf(System.getProperty("compilertest.test262")); private static final String TEST_BASIC_DIR = System.getProperty("test.basic.dir"); - private static final String TEST_NODE_DIR = System.getProperty("test.node.dir"); private static final String TEST262_SUITE_DIR = System.getProperty("test262.suite.dir"); interface TestFilter { @@ -108,8 +107,6 @@ return file.getName().equals("es6"); } }); - compileTestSet(new File(TEST_NODE_DIR, "node"), null); - compileTestSet(new File(TEST_NODE_DIR, "src"), null); } private void compileTestSet(final File testSetDir, final TestFilter filter) {