From 368651b7acefe616fbf7e1c2326c7bf01f33e748 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 7 Feb 2024 22:04:55 -0600
Subject: [PATCH] Make tests resilient to different OpenJDK vendors

Still assumes Java 8 rather than 9+, though.
---
 test/fiji.t  | 5 +----
 test/jy.t    | 5 +----
 test/parsy.t | 5 +----
 3 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/test/fiji.t b/test/fiji.t
index a748112..3e23287 100644
--- a/test/fiji.t
+++ b/test/fiji.t
@@ -108,9 +108,7 @@ Test command line argument combinations.
   $ ./fiji-linux-x64 --print-java-home
   /* (glob)
 
-  $ ./fiji-linux-x64 --print-java-info 2>&1 | grep -v '^\* \(java\|sun\|user\)\.' | LC_ALL=C sort
-  \* IMPLEMENTOR=* (glob)
-  \* IMPLEMENTOR_VERSION=* (glob)
+  $ ./fiji-linux-x64 --print-java-info 2>&1 | grep -v '^\* \(IMPLEMENTOR\|java\.\|jdk\.\|sun\.\|user\.\)' | LC_ALL=C sort
   \* JAVA_VERSION=* (glob)
   * OS_ARCH=amd64
   * OS_NAME=Linux
@@ -120,7 +118,6 @@ Test command line argument combinations.
   * file.encoding.pkg=sun.io
   \* file.encoding=* (glob)
   * file.separator=/
-  \* jdk.vendor.version=* (glob)
   * line.separator=
   * os.arch=amd64
   * os.name=Linux
diff --git a/test/jy.t b/test/jy.t
index 57ea145..d5cd7ea 100644
--- a/test/jy.t
+++ b/test/jy.t
@@ -76,9 +76,7 @@ Test command line argument combinations.
   $ ./jy-linux-x64 --print-java-home
   /* (glob)
 
-  $ ./jy-linux-x64 --print-java-info 2>&1 | grep -v '^\* \(java\|sun\|user\)\.' | LC_ALL=C sort
-  \* IMPLEMENTOR=* (glob)
-  \* IMPLEMENTOR_VERSION=* (glob)
+  $ ./jy-linux-x64 --print-java-info 2>&1 | grep -v '^\* \(IMPLEMENTOR\|java\.\|jdk\.\|sun\.\|user\.\)' | LC_ALL=C sort
   \* JAVA_VERSION=* (glob)
   * OS_ARCH=amd64
   * OS_NAME=Linux
@@ -88,7 +86,6 @@ Test command line argument combinations.
   * file.encoding.pkg=sun.io
   \* file.encoding=* (glob)
   * file.separator=/
-  \* jdk.vendor.version=* (glob)
   * line.separator=
   * os.arch=amd64
   * os.name=Linux
diff --git a/test/parsy.t b/test/parsy.t
index 1ff738e..ef22798 100644
--- a/test/parsy.t
+++ b/test/parsy.t
@@ -51,9 +51,7 @@ Test command line argument combinations.
   $ ./parsy-linux-x64 --print-java-home
   /* (glob)
 
-  $ ./parsy-linux-x64 --print-java-info 2>&1 | grep -v '^\* \(java\|sun\|user\)\.' | LC_ALL=C sort
-  \* IMPLEMENTOR=* (glob)
-  \* IMPLEMENTOR_VERSION=* (glob)
+  $ ./parsy-linux-x64 --print-java-info 2>&1 | grep -v '^\* \(IMPLEMENTOR\|java\.\|jdk\.\|sun\.\|user\.\)' | LC_ALL=C sort
   \* JAVA_VERSION=* (glob)
   * OS_ARCH=amd64
   * OS_NAME=Linux
@@ -63,7 +61,6 @@ Test command line argument combinations.
   * file.encoding.pkg=sun.io
   \* file.encoding=* (glob)
   * file.separator=/
-  \* jdk.vendor.version=* (glob)
   * line.separator=
   * os.arch=amd64
   * os.name=Linux