Skip to content

Commit 2483706

Browse files
author
duke
committed
Backport 7e87c071b0fd832473f17ec0f579df40bea62950
1 parent cce9336 commit 2483706

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

test/jdk/sun/security/tools/jarsigner/PreserveRawManifestEntryAndDigest.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -247,9 +247,8 @@ String[] fromFirstToSecondEmptyLine(String[] lines) {
247247
* @see "concise_jarsigner.sh"
248248
*/
249249
String[] getExpectedJarSignerOutputUpdatedContentNotValidatedBySignerA(
250-
String jarFilename, String digestalg,
251250
String firstAddedFilename, String secondAddedFilename) {
252-
final String TS = ".{28,29}"; // matches a timestamp
251+
final String TS = ".{28,34}"; // matches a timestamp
253252
List<String> expLines = new ArrayList<>();
254253
expLines.add("s k *\\d+ " + TS + " META-INF/MANIFEST[.]MF");
255254
expLines.add(" *\\d+ " + TS + " META-INF/B[.]SF");
@@ -351,7 +350,6 @@ String test(String name,
351350
assertMatchByLines(
352351
fromFirstToSecondEmptyLine(o.getStdout().split("\\R")),
353352
getExpectedJarSignerOutputUpdatedContentNotValidatedBySignerA(
354-
jarFilename4, digestalg,
355353
firstAddedFilename, secondAddedFilename));
356354

357355
// double-check reading the files with a verifying JarFile

0 commit comments

Comments
 (0)