This repository has been archived by the owner on Feb 2, 2023. It is now read-only.
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
8 changed files
with
163 additions
and
12 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 4 additions & 2 deletions
6
src/jdk.incubator.vector/linux/native/libjsvml/globals_vectorApiSupport_linux.S.inc
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 4 additions & 2 deletions
6
src/jdk.incubator.vector/windows/native/libjsvml/globals_vectorApiSupport_windows.S.inc
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,135 @@ | ||
| /* | ||
| * Copyright (c) 2022, Huawei Technologies Co., Ltd. All rights reserved. | ||
| * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. | ||
| * | ||
| * This code is free software; you can redistribute it and/or modify it | ||
| * under the terms of the GNU General Public License version 2 only, as | ||
| * published by the Free Software Foundation. | ||
| * | ||
| * This code is distributed in the hope that it will be useful, but WITHOUT | ||
| * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
| * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | ||
| * version 2 for more details (a copy is included in the LICENSE file that | ||
| * accompanied this code). | ||
| * | ||
| * You should have received a copy of the GNU General Public License version | ||
| * 2 along with this work; if not, write to the Free Software Foundation, | ||
| * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | ||
| * | ||
| * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA | ||
| * or visit www.oracle.com if you need additional information or have any | ||
| * questions. | ||
| */ | ||
|
|
||
| /* | ||
| * @test | ||
| * @bug 8240903 | ||
| * @summary Test consistency of moduleHashes attribute between builds | ||
| * @library /test/lib | ||
| * @run testng HashesOrderTest | ||
| */ | ||
|
|
||
| import java.io.IOException; | ||
| import java.nio.file.Files; | ||
| import java.nio.file.Path; | ||
| import java.util.ArrayList; | ||
| import java.util.Arrays; | ||
| import java.util.Collections; | ||
| import java.util.List; | ||
| import java.util.spi.ToolProvider; | ||
| import java.util.stream.Collectors; | ||
|
|
||
| import jdk.test.lib.compiler.ModuleInfoMaker; | ||
|
|
||
| import org.testng.annotations.Test; | ||
|
|
||
| import static org.testng.Assert.assertEquals; | ||
|
|
||
| public class HashesOrderTest { | ||
| private ToolProvider JMOD_TOOL = ToolProvider.findFirst("jmod") | ||
| .orElseThrow(() -> | ||
| new RuntimeException("jmod tool not found") | ||
| ); | ||
|
|
||
| private String DATE = "2021-01-06T14:36:00+02:00"; | ||
| private int NUM_MODULES = 64; | ||
| private Path mods; | ||
| private Path lib1; | ||
| private Path lib2; | ||
| private ModuleInfoMaker builder; | ||
|
|
||
| @Test | ||
| public void test() throws Exception { | ||
| mods = Path.of("mods"); | ||
| lib1 = Path.of("lib1"); | ||
| lib2 = Path.of("lib2"); | ||
| builder = new ModuleInfoMaker(Path.of("src")); | ||
|
|
||
| Files.createDirectories(mods); | ||
| Files.createDirectories(lib1); | ||
| Files.createDirectories(lib2); | ||
|
|
||
| makeModule("ma"); | ||
| String moduleName; | ||
| for (int i = 0; i < NUM_MODULES; i++) { | ||
| moduleName = "m" + i + "b"; | ||
| makeModule(moduleName, "ma"); | ||
| makeJmod(moduleName, lib1); | ||
| makeJmod(moduleName, lib2); | ||
| } | ||
| makeJmod("ma", lib1, "--module-path", lib1.toString(), | ||
| "--hash-modules", ".*"); | ||
| Path jmod1 = lib1.resolve("ma.jmod"); | ||
|
|
||
| makeJmod("ma", lib2, "--module-path", lib2.toString(), | ||
| "--hash-modules", ".*"); | ||
| Path jmod2 = lib2.resolve("ma.jmod"); | ||
|
|
||
| assertEquals(Files.mismatch(jmod1, jmod2), -1); | ||
| } | ||
|
|
||
| private void makeModule(String mn, String... deps) | ||
| throws IOException | ||
| { | ||
| StringBuilder sb = new StringBuilder(); | ||
| sb.append("module ") | ||
| .append(mn) | ||
| .append(" {") | ||
| .append("\n"); | ||
| Arrays.stream(deps) | ||
| .forEach(req -> { | ||
| sb.append(" requires "); | ||
| sb.append(req) | ||
| .append(";\n"); | ||
| }); | ||
| sb.append("}\n"); | ||
| builder.writeJavaFiles(mn, sb.toString()); | ||
| builder.compile(mn, mods); | ||
| } | ||
|
|
||
| private void makeJmod(String moduleName, Path libName, String... options) { | ||
| Path mclasses = mods.resolve(moduleName); | ||
| Path outfile = libName.resolve(moduleName + ".jmod"); | ||
| List<String> args = new ArrayList<>(); | ||
| args.add("create"); | ||
| Collections.addAll(args, options); | ||
| Collections.addAll(args, "--date", DATE); | ||
| Collections.addAll(args, "--class-path", mclasses.toString(), | ||
| outfile.toString()); | ||
|
|
||
| runJmod(args); | ||
| } | ||
|
|
||
| private void runJmod(List<String> args) { | ||
| runJmod(args.toArray(new String[args.size()])); | ||
| } | ||
|
|
||
| private void runJmod(String... args) { | ||
| int rc = JMOD_TOOL.run(System.out, System.out, args); | ||
| System.out.println("jmod " + Arrays.stream(args).collect(Collectors.joining(" "))); | ||
| if (rc != 0) { | ||
| throw new AssertionError("jmod failed: rc = " + rc); | ||
| } | ||
| } | ||
|
|
||
| } |