# HG changeset patch
# User alanb
# Date 1519066963 0
# Node ID b417304c811b8d680a8f969655d0176d41bab81a
# Parent  0a185d6fafa1fdae27411a9af62368c6dab07f05
8198380: tools/jimage/JImageExtractTest.java failing
Reviewed-by: alanb
Contributed-by: mvala@redhat.com

diff -r 0a185d6fafa1 -r b417304c811b test/jdk/ProblemList.txt
--- a/test/jdk/ProblemList.txt	Mon Feb 19 18:43:28 2018 +0000
+++ b/test/jdk/ProblemList.txt	Mon Feb 19 19:02:43 2018 +0000
@@ -464,8 +464,6 @@
 
 tools/launcher/FXLauncherTest.java                              8068049 linux-all,macosx-all
 
-tools/jimage/JImageExtractTest.java                             8170120 generic-all
-
 ############################################################################
 
 # jdk_jdi
diff -r 0a185d6fafa1 -r b417304c811b test/jdk/tools/jimage/JImageExtractTest.java
--- a/test/jdk/tools/jimage/JImageExtractTest.java	Mon Feb 19 18:43:28 2018 +0000
+++ b/test/jdk/tools/jimage/JImageExtractTest.java	Mon Feb 19 19:02:43 2018 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2018, Oracle and/or its affiliates. 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
@@ -154,8 +154,10 @@
         Path tmp = Files.createTempDirectory(Paths.get("."), getClass().getName());
         Files.createFile(Paths.get(tmp.toString(), ".not_empty"));
         jimage("extract", "--dir", tmp.toString(), getImagePath())
-                .assertFailure()
-                .assertShowsError();
+                .assertSuccess()
+                .resultChecker(r -> {
+                    assertTrue(r.output.isEmpty(), "Output is not expected");
+                });
     }
 
     public void testExtractToFile() throws IOException {