8286191: misc tests fail due to JDK-8285987

Reviewed-by: rriggs
openjdk · May 10, 2022 · de8f4d0 · de8f4d0 · openjdk-notifier · May 10, 2022
1 parent bf0dc4f
commit de8f4d0
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 6 deletions.
diff --git a/test/langtools/ProblemList.txt b/test/langtools/ProblemList.txt
@@ -35,7 +35,6 @@ jdk/jshell/UserJdiUserRemoteTest.java
 jdk/jshell/UserInputTest.java                                                   8169536    generic-all
 jdk/jshell/ToolBasicTest.java                                                   8265357    macosx-aarch64
 jdk/jshell/HighlightUITest.java                                                 8284144    generic-aarch64,macosx-x64,linux-x64
-jdk/jshell/ExternalEditorTest.java                                              8286191    generic-all
 
 ###########################################################################
 #

diff --git a/test/langtools/jdk/jshell/ExternalEditorTest.java b/test/langtools/jdk/jshell/ExternalEditorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2017, 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
@@ -25,8 +25,6 @@
  * @test
  * @summary Testing external editor.
  * @bug 8143955 8080843 8163816 8143006 8169828 8171130 8162989 8210808
- * @comment musl/Alpine has problems executing some shell scripts, see 8285987
- * @requires !vm.musl
  * @modules jdk.jshell/jdk.internal.jshell.tool
  * @build ReplToolTesting CustomEditor EditorTestBase
  * @run testng ExternalEditorTest

diff --git a/test/lib-test/ProblemList.txt b/test/lib-test/ProblemList.txt
@@ -37,4 +37,3 @@
 # More than one label is allowed but must be on the same line.
 #
 #############################################################################
-jdk/test/lib/TestMutuallyExclusivePlatformPredicates.java 8286191 generic-all
diff --git a/test/lib-test/jdk/test/lib/TestMutuallyExclusivePlatformPredicates.java b/test/lib-test/jdk/test/lib/TestMutuallyExclusivePlatformPredicates.java
@@ -50,7 +50,7 @@ private static enum MethodGroup {
         OS("isAix", "isLinux", "isOSX", "isWindows"),
         VM_TYPE("isClient", "isServer", "isMinimal", "isZero", "isEmbedded"),
         MODE("isInt", "isMixed", "isComp"),
-        IGNORED("isEmulatedClient", "isDebugBuild", "isFastDebugBuild",
+        IGNORED("isEmulatedClient", "isDebugBuild", "isFastDebugBuild", "isMusl",
                 "isSlowDebugBuild", "hasSA", "isRoot", "isTieredSupported",
                 "areCustomLoadersSupportedForCDS", "isDefaultCDSArchiveSupported",
                 "isHardenedOSX");