Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
8240903: Add test to check that jmod hashes are reproducible
Reviewed-by: alanb
  • Loading branch information
Dongbo He authored and RealFYang committed Apr 16, 2022
1 parent dce7240 commit 9695283
Showing 1 changed file with 135 additions and 0 deletions.
135 changes: 135 additions & 0 deletions test/jdk/tools/jmod/hashes/HashesOrderTest.java
@@ -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);
}
}

}

7 comments on commit 9695283

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@RealCLanger
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/backport jdk11u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on 9695283 May 28, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@RealCLanger the backport was successfully created on the branch RealCLanger-backport-96952834 in my personal fork of openjdk/jdk11u-dev. To create a pull request with this backport targeting openjdk/jdk11u-dev:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit 96952834 from the openjdk/jdk repository.

The commit being backported was authored by Dongbo He on 16 Apr 2022 and was reviewed by Alan Bateman.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk11u-dev:

$ git fetch https://github.com/openjdk-bots/jdk11u-dev RealCLanger-backport-96952834:RealCLanger-backport-96952834
$ git checkout RealCLanger-backport-96952834
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk11u-dev RealCLanger-backport-96952834

@RealCLanger
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/backport jdk17u-dev

@RealCLanger
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/backport jdk18u

@openjdk
Copy link

@openjdk openjdk bot commented on 9695283 May 29, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@RealCLanger the backport was successfully created on the branch RealCLanger-backport-96952834 in my personal fork of openjdk/jdk18u. To create a pull request with this backport targeting openjdk/jdk18u:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit 96952834 from the openjdk/jdk repository.

The commit being backported was authored by Dongbo He on 16 Apr 2022 and was reviewed by Alan Bateman.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk18u:

$ git fetch https://github.com/openjdk-bots/jdk18u RealCLanger-backport-96952834:RealCLanger-backport-96952834
$ git checkout RealCLanger-backport-96952834
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk18u RealCLanger-backport-96952834

@openjdk
Copy link

@openjdk openjdk bot commented on 9695283 May 29, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@RealCLanger the backport was successfully created on the branch RealCLanger-backport-96952834 in my personal fork of openjdk/jdk17u-dev. To create a pull request with this backport targeting openjdk/jdk17u-dev:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit 96952834 from the openjdk/jdk repository.

The commit being backported was authored by Dongbo He on 16 Apr 2022 and was reviewed by Alan Bateman.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk17u-dev:

$ git fetch https://github.com/openjdk-bots/jdk17u-dev RealCLanger-backport-96952834:RealCLanger-backport-96952834
$ git checkout RealCLanger-backport-96952834
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk17u-dev RealCLanger-backport-96952834

Please sign in to comment.