Mercurial > jdk8-mips64-public > nashorn / changeset
changeset
8057742: ant clean test should not fail if one or more external test suites are missing
Mon, 08 Sep 2014 15:51:27 +0530
- author
- sundar
- date
- Mon, 08 Sep 2014 15:51:27 +0530
- changeset 992
- 7caec82669a4
- parent 991
- b7a2db4de254
- child 993
- 45f9decf4fb5
8057742: ant clean test should not fail if one or more external test suites are missing
Reviewed-by: lagergren, hannesw
1.1 --- a/test/script/basic/JDK-8048079_1.js Thu Sep 04 18:47:18 2014 +0200 1.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 1.3 @@ -1,35 +0,0 @@ 1.4 -/* 1.5 - * Copyright (c) 2010, 2014, 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 - * This code is free software; you can redistribute it and/or modify it 1.9 - * under the terms of the GNU General Public License version 2 only, as 1.10 - * published by the Free Software Foundation. 1.11 - * 1.12 - * This code is distributed in the hope that it will be useful, but WITHOUT 1.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 1.14 - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 1.15 - * version 2 for more details (a copy is included in the LICENSE file that 1.16 - * accompanied this code). 1.17 - * 1.18 - * You should have received a copy of the GNU General Public License version 1.19 - * 2 along with this work; if not, write to the Free Software Foundation, 1.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 1.21 - * 1.22 - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 1.23 - * or visit www.oracle.com if you need additional information or have any 1.24 - * questions. 1.25 - */ 1.26 - 1.27 -/** 1.28 - * JDK-8048079: Persistent code store is broken after optimistic types merge 1.29 - * 1.30 - * @test 1.31 - * @run 1.32 - * @option -pcc 1.33 - * @option -Dnashorn.persistent.code.cache=build/nashorn_code_cache 1.34 - * @fork 1.35 - */ 1.36 - 1.37 -load(__DIR__ + 'prototype.js'); 1.38 -load(__DIR__ + 'yui.js');
2.1 --- a/test/script/basic/JDK-8048079_1.js.EXPECTED Thu Sep 04 18:47:18 2014 +0200 2.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 2.3 @@ -1,3 +0,0 @@ 2.4 -parsed and compiled ok prototype.js 2.5 -parsed and compiled ok yui-min.js 2.6 -parsed and compiled ok yui.js
3.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 3.2 +++ b/test/script/basic/JDK-8048079_1a.js Mon Sep 08 15:51:27 2014 +0530 3.3 @@ -0,0 +1,34 @@ 3.4 +/* 3.5 + * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved. 3.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 3.7 + * 3.8 + * This code is free software; you can redistribute it and/or modify it 3.9 + * under the terms of the GNU General Public License version 2 only, as 3.10 + * published by the Free Software Foundation. 3.11 + * 3.12 + * This code is distributed in the hope that it will be useful, but WITHOUT 3.13 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 3.14 + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 3.15 + * version 2 for more details (a copy is included in the LICENSE file that 3.16 + * accompanied this code). 3.17 + * 3.18 + * You should have received a copy of the GNU General Public License version 3.19 + * 2 along with this work; if not, write to the Free Software Foundation, 3.20 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 3.21 + * 3.22 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 3.23 + * or visit www.oracle.com if you need additional information or have any 3.24 + * questions. 3.25 + */ 3.26 + 3.27 +/** 3.28 + * JDK-8048079: Persistent code store is broken after optimistic types merge 3.29 + * 3.30 + * @test 3.31 + * @runif external.prototype 3.32 + * @option -pcc 3.33 + * @option -Dnashorn.persistent.code.cache=build/nashorn_code_cache 3.34 + * @fork 3.35 + */ 3.36 + 3.37 +load(__DIR__ + 'prototype.js');
4.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 4.2 +++ b/test/script/basic/JDK-8048079_1a.js.EXPECTED Mon Sep 08 15:51:27 2014 +0530 4.3 @@ -0,0 +1,1 @@ 4.4 +parsed and compiled ok prototype.js
5.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 5.2 +++ b/test/script/basic/JDK-8048079_1b.js Mon Sep 08 15:51:27 2014 +0530 5.3 @@ -0,0 +1,34 @@ 5.4 +/* 5.5 + * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved. 5.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 5.7 + * 5.8 + * This code is free software; you can redistribute it and/or modify it 5.9 + * under the terms of the GNU General Public License version 2 only, as 5.10 + * published by the Free Software Foundation. 5.11 + * 5.12 + * This code is distributed in the hope that it will be useful, but WITHOUT 5.13 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 5.14 + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 5.15 + * version 2 for more details (a copy is included in the LICENSE file that 5.16 + * accompanied this code). 5.17 + * 5.18 + * You should have received a copy of the GNU General Public License version 5.19 + * 2 along with this work; if not, write to the Free Software Foundation, 5.20 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 5.21 + * 5.22 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 5.23 + * or visit www.oracle.com if you need additional information or have any 5.24 + * questions. 5.25 + */ 5.26 + 5.27 +/** 5.28 + * JDK-8048079: Persistent code store is broken after optimistic types merge 5.29 + * 5.30 + * @test 5.31 + * @runif external.yui 5.32 + * @option -pcc 5.33 + * @option -Dnashorn.persistent.code.cache=build/nashorn_code_cache 5.34 + * @fork 5.35 + */ 5.36 + 5.37 +load(__DIR__ + 'yui.js');
6.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 6.2 +++ b/test/script/basic/JDK-8048079_1b.js.EXPECTED Mon Sep 08 15:51:27 2014 +0530 6.3 @@ -0,0 +1,2 @@ 6.4 +parsed and compiled ok yui-min.js 6.5 +parsed and compiled ok yui.js
7.1 --- a/test/script/basic/JDK-8048079_2.js Thu Sep 04 18:47:18 2014 +0200 7.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 7.3 @@ -1,35 +0,0 @@ 7.4 -/* 7.5 - * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved. 7.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 7.7 - * 7.8 - * This code is free software; you can redistribute it and/or modify it 7.9 - * under the terms of the GNU General Public License version 2 only, as 7.10 - * published by the Free Software Foundation. 7.11 - * 7.12 - * This code is distributed in the hope that it will be useful, but WITHOUT 7.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 7.14 - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 7.15 - * version 2 for more details (a copy is included in the LICENSE file that 7.16 - * accompanied this code). 7.17 - * 7.18 - * You should have received a copy of the GNU General Public License version 7.19 - * 2 along with this work; if not, write to the Free Software Foundation, 7.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 7.21 - * 7.22 - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 7.23 - * or visit www.oracle.com if you need additional information or have any 7.24 - * questions. 7.25 - */ 7.26 - 7.27 -/** 7.28 - * JDK-8048079: Persistent code store is broken after optimistic types merge 7.29 - * 7.30 - * @test 7.31 - * @run 7.32 - * @option -pcc 7.33 - * @option -Dnashorn.persistent.code.cache=build/nashorn_code_cache 7.34 - * @fork 7.35 - */ 7.36 - 7.37 -load(__DIR__ + 'prototype.js'); 7.38 -load(__DIR__ + 'yui.js');
8.1 --- a/test/script/basic/JDK-8048079_2.js.EXPECTED Thu Sep 04 18:47:18 2014 +0200 8.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 8.3 @@ -1,3 +0,0 @@ 8.4 -parsed and compiled ok prototype.js 8.5 -parsed and compiled ok yui-min.js 8.6 -parsed and compiled ok yui.js
9.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 9.2 +++ b/test/script/basic/JDK-8048079_2a.js Mon Sep 08 15:51:27 2014 +0530 9.3 @@ -0,0 +1,34 @@ 9.4 +/* 9.5 + * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved. 9.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 9.7 + * 9.8 + * This code is free software; you can redistribute it and/or modify it 9.9 + * under the terms of the GNU General Public License version 2 only, as 9.10 + * published by the Free Software Foundation. 9.11 + * 9.12 + * This code is distributed in the hope that it will be useful, but WITHOUT 9.13 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 9.14 + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 9.15 + * version 2 for more details (a copy is included in the LICENSE file that 9.16 + * accompanied this code). 9.17 + * 9.18 + * You should have received a copy of the GNU General Public License version 9.19 + * 2 along with this work; if not, write to the Free Software Foundation, 9.20 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 9.21 + * 9.22 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 9.23 + * or visit www.oracle.com if you need additional information or have any 9.24 + * questions. 9.25 + */ 9.26 + 9.27 +/** 9.28 + * JDK-8048079: Persistent code store is broken after optimistic types merge. 9.29 + * Same script as JDK-8048079_1a.js to exercise code cache. 9.30 + * @test 9.31 + * @runif external.prototype 9.32 + * @option -pcc 9.33 + * @option -Dnashorn.persistent.code.cache=build/nashorn_code_cache 9.34 + * @fork 9.35 + */ 9.36 + 9.37 +load(__DIR__ + 'prototype.js');
10.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 10.2 +++ b/test/script/basic/JDK-8048079_2a.js.EXPECTED Mon Sep 08 15:51:27 2014 +0530 10.3 @@ -0,0 +1,1 @@ 10.4 +parsed and compiled ok prototype.js
11.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 11.2 +++ b/test/script/basic/JDK-8048079_2b.js Mon Sep 08 15:51:27 2014 +0530 11.3 @@ -0,0 +1,34 @@ 11.4 +/* 11.5 + * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved. 11.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 11.7 + * 11.8 + * This code is free software; you can redistribute it and/or modify it 11.9 + * under the terms of the GNU General Public License version 2 only, as 11.10 + * published by the Free Software Foundation. 11.11 + * 11.12 + * This code is distributed in the hope that it will be useful, but WITHOUT 11.13 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 11.14 + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 11.15 + * version 2 for more details (a copy is included in the LICENSE file that 11.16 + * accompanied this code). 11.17 + * 11.18 + * You should have received a copy of the GNU General Public License version 11.19 + * 2 along with this work; if not, write to the Free Software Foundation, 11.20 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 11.21 + * 11.22 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 11.23 + * or visit www.oracle.com if you need additional information or have any 11.24 + * questions. 11.25 + */ 11.26 + 11.27 +/** 11.28 + * JDK-8048079: Persistent code store is broken after optimistic types merge 11.29 + * Same script as JDK-8048079_1b.js to exercise code cache again. 11.30 + * @test 11.31 + * @runif external.yui 11.32 + * @option -pcc 11.33 + * @option -Dnashorn.persistent.code.cache=build/nashorn_code_cache 11.34 + * @fork 11.35 + */ 11.36 + 11.37 +load(__DIR__ + 'yui.js');
12.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 12.2 +++ b/test/script/basic/JDK-8048079_2b.js.EXPECTED Mon Sep 08 15:51:27 2014 +0530 12.3 @@ -0,0 +1,2 @@ 12.4 +parsed and compiled ok yui-min.js 12.5 +parsed and compiled ok yui.js
13.1 --- a/test/script/basic/splitter.js Thu Sep 04 18:47:18 2014 +0200 13.2 +++ b/test/script/basic/splitter.js Mon Sep 08 15:51:27 2014 +0530 13.3 @@ -30,7 +30,5 @@ 13.4 * @fork 13.5 */ 13.6 13.7 -load(__DIR__ + 'prototype.js'); 13.8 -load(__DIR__ + 'yui.js'); 13.9 load(__DIR__ + 'NASHORN-689.js'); 13.10 load(__DIR__ + 'NASHORN-58.js');
14.1 --- a/test/script/basic/splitter.js.EXPECTED Thu Sep 04 18:47:18 2014 +0200 14.2 +++ b/test/script/basic/splitter.js.EXPECTED Mon Sep 08 15:51:27 2014 +0530 14.3 @@ -1,6 +1,3 @@ 14.4 -parsed and compiled ok prototype.js 14.5 -parsed and compiled ok yui-min.js 14.6 -parsed and compiled ok yui.js 14.7 a=10 14.8 a=9 14.9 a=8
15.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 15.2 +++ b/test/script/basic/splitter_prototype.js Mon Sep 08 15:51:27 2014 +0530 15.3 @@ -0,0 +1,33 @@ 15.4 +/* 15.5 + * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. 15.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 15.7 + * 15.8 + * This code is free software; you can redistribute it and/or modify it 15.9 + * under the terms of the GNU General Public License version 2 only, as 15.10 + * published by the Free Software Foundation. 15.11 + * 15.12 + * This code is distributed in the hope that it will be useful, but WITHOUT 15.13 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 15.14 + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 15.15 + * version 2 for more details (a copy is included in the LICENSE file that 15.16 + * accompanied this code). 15.17 + * 15.18 + * You should have received a copy of the GNU General Public License version 15.19 + * 2 along with this work; if not, write to the Free Software Foundation, 15.20 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 15.21 + * 15.22 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 15.23 + * or visit www.oracle.com if you need additional information or have any 15.24 + * questions. 15.25 + */ 15.26 + 15.27 +/** 15.28 + * Test various scripts with low splitter threshold 15.29 + * 15.30 + * @test 15.31 + * @option -Dnashorn.compiler.splitter.threshold=200 15.32 + * @runif external.prototype 15.33 + * @fork 15.34 + */ 15.35 + 15.36 +load(__DIR__ + 'prototype.js');
16.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 16.2 +++ b/test/script/basic/splitter_prototype.js.EXPECTED Mon Sep 08 15:51:27 2014 +0530 16.3 @@ -0,0 +1,1 @@ 16.4 +parsed and compiled ok prototype.js
17.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 17.2 +++ b/test/script/basic/splitter_yui.js Mon Sep 08 15:51:27 2014 +0530 17.3 @@ -0,0 +1,33 @@ 17.4 +/* 17.5 + * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. 17.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 17.7 + * 17.8 + * This code is free software; you can redistribute it and/or modify it 17.9 + * under the terms of the GNU General Public License version 2 only, as 17.10 + * published by the Free Software Foundation. 17.11 + * 17.12 + * This code is distributed in the hope that it will be useful, but WITHOUT 17.13 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 17.14 + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 17.15 + * version 2 for more details (a copy is included in the LICENSE file that 17.16 + * accompanied this code). 17.17 + * 17.18 + * You should have received a copy of the GNU General Public License version 17.19 + * 2 along with this work; if not, write to the Free Software Foundation, 17.20 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 17.21 + * 17.22 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 17.23 + * or visit www.oracle.com if you need additional information or have any 17.24 + * questions. 17.25 + */ 17.26 + 17.27 +/** 17.28 + * Test various scripts with low splitter threshold 17.29 + * 17.30 + * @test 17.31 + * @option -Dnashorn.compiler.splitter.threshold=200 17.32 + * @runif external.yui 17.33 + * @fork 17.34 + */ 17.35 + 17.36 +load(__DIR__ + 'yui.js');
18.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 18.2 +++ b/test/script/basic/splitter_yui.js.EXPECTED Mon Sep 08 15:51:27 2014 +0530 18.3 @@ -0,0 +1,2 @@ 18.4 +parsed and compiled ok yui-min.js 18.5 +parsed and compiled ok yui.js
19.1 --- a/test/src/jdk/nashorn/internal/test/framework/TestFinder.java Thu Sep 04 18:47:18 2014 +0200 19.2 +++ b/test/src/jdk/nashorn/internal/test/framework/TestFinder.java Mon Sep 08 15:51:27 2014 +0530 19.3 @@ -261,14 +261,17 @@ 19.4 isTest = false; 19.5 isNotTest = true; 19.6 break; 19.7 - case "@runif": 19.8 - if (System.getProperty(scanner.next()) != null) { 19.9 + case "@runif": { 19.10 + final String prop = scanner.next(); 19.11 + if (System.getProperty(prop) != null) { 19.12 shouldRun = true; 19.13 } else { 19.14 + factory.log("WARNING: (" + prop + ") skipping " + testFile); 19.15 isTest = false; 19.16 isNotTest = true; 19.17 } 19.18 break; 19.19 + } 19.20 case "@run": 19.21 shouldRun = true; 19.22 break;
