Skip to content

Commit 33ff519

Browse files
committed
8340116: test/jdk/sun/security/tools/jarsigner/PreserveRawManifestEntryAndDigest.java can fail due to regex
Backport-of: 7e87c071b0fd832473f17ec0f579df40bea62950
1 parent 9d0d036 commit 33ff519

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
@@ -244,9 +244,8 @@ String[] fromFirstToSecondEmptyLine(String[] lines) {
244244
* @see "concise_jarsigner.sh"
245245
*/
246246
String[] getExpectedJarSignerOutputUpdatedContentNotValidatedBySignerA(
247-
String jarFilename, String digestalg,
248247
String firstAddedFilename, String secondAddedFilename) {
249-
final String TS = ".{28,29}"; // matches a timestamp
248+
final String TS = ".{28,34}"; // matches a timestamp
250249
List<String> expLines = new ArrayList<>();
251250
expLines.add("s k *\\d+ " + TS + " META-INF/MANIFEST[.]MF");
252251
expLines.add(" *\\d+ " + TS + " META-INF/B[.]SF");
@@ -348,7 +347,6 @@ String test(String name,
348347
assertMatchByLines(
349348
fromFirstToSecondEmptyLine(o.getStdout().split("\\R")),
350349
getExpectedJarSignerOutputUpdatedContentNotValidatedBySignerA(
351-
jarFilename4, digestalg,
352350
firstAddedFilename, secondAddedFilename));
353351

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

0 commit comments

Comments
 (0)