Make tests resilient to different OpenJDK vendors

Still assumes Java 8 rather than 9+, though.
apposed · Feb 8, 2024 · 368651b · 368651b
1 parent fbb631c
commit 368651b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 12 deletions.
diff --git 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
@@ -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
@@ -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