8295164: JDK 8 jdi tests should not use tasklist command on Windows

Also enable jdk_tier1 GHA tests on Windows Reviewed-by: sgehwolf
openjdk · Oct 13, 2022 · 8280a89 · 8280a89 · openjdk-notifier · Oct 13, 2022
1 parent 05b249d
commit 8280a89
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 18 deletions.
diff --git a/.github/workflows/submit.yml b/.github/workflows/submit.yml
@@ -989,7 +989,6 @@ jobs:
   windows_x64_test:
     name: Windows x64
     runs-on: "windows-2019"
-    if: false
     needs:
       - prerequisites
       - windows_x64_build
@@ -999,15 +998,15 @@ jobs:
       matrix:
         test:
           - jdk/tier1
-          - langtools/tier1
-          - hotspot/tier1
+#          - langtools/tier1
+#          - hotspot/tier1
         include:
           - test: jdk/tier1
             suites: jdk_tier1
-          - test: langtools/tier1
-            suites: langtools_tier1
-          - test: hotspot/tier1
-            suites: hotspot_tier1
+#          - test: langtools/tier1
+#            suites: langtools_tier1
+#          - test: hotspot/tier1
+#            suites: hotspot_tier1
 
     env:
       JDK_VERSION: "${{ fromJson(needs.prerequisites.outputs.dependencies).JDK_MAJOR_VERSION }}.${{ fromJson(needs.prerequisites.outputs.dependencies).JDK_MINOR_VERSION }}.${{ fromJson(needs.prerequisites.outputs.dependencies).JDK_MICRO_VERSION }}"
@@ -1135,7 +1134,6 @@ jobs:
   windows_x86_test:
     name: Windows x86
     runs-on: "windows-2019"
-    if: false
     needs:
       - prerequisites
       - windows_x86_build
@@ -1145,15 +1143,15 @@ jobs:
       matrix:
         test:
           - jdk/tier1
-          - langtools/tier1
-          - hotspot/tier1
+#          - langtools/tier1
+#          - hotspot/tier1
         include:
           - test: jdk/tier1
             suites: jdk_tier1
-          - test: langtools/tier1
-            suites: langtools_tier1
-          - test: hotspot/tier1
-            suites: hotspot_tier1
+#          - test: langtools/tier1
+#            suites: langtools_tier1
+#          - test: hotspot/tier1
+#            suites: hotspot_tier1
 
     env:
       JDK_VERSION: "${{ fromJson(needs.prerequisites.outputs.dependencies).JDK_MAJOR_VERSION }}.${{ fromJson(needs.prerequisites.outputs.dependencies).JDK_MINOR_VERSION }}.${{ fromJson(needs.prerequisites.outputs.dependencies).JDK_MICRO_VERSION }}"

diff --git a/jdk/test/com/sun/jdi/ShellScaffold.sh b/jdk/test/com/sun/jdi/ShellScaffold.sh
@@ -201,9 +201,9 @@ findPid()
             res=$?
             ;;
         Windows* | CYGWIN*)
-            # Don't use ps on cygwin since it sometimes misses
-            # some processes (!).
-            tasklist /NH | $grep " $1 " > $devnull 2>&1
+            # No longer possible to use tasklist as Cygwin PIDs are no longer
+            # same as Windows PIDs
+            $psCmd | $grep '^ *'"$1 " > $devnull 2>&1
             res=$?
             ;;
        *)
@@ -281,7 +281,7 @@ EOF
          rm -f $tmpFile
          # on mks
          grep=egrep
-         psCmd=ps
+         psCmd="ps -W"
          jstack=jstack.exe
          ;;
        SunOS | Linux | Darwin | AIX)