Fix test_openjpeg under wasm64. NFC

openjpeg was assuming a different signature for getopt_long which was not problem under wasm32.
emscripten-core · Feb 23, 2024 · 6f99f2e · 6f99f2e
1 parent 135baa3
commit 6f99f2e
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 13 deletions.
diff --git a/test/test_core.py b/test/test_core.py
@@ -6811,7 +6811,6 @@ def test_poppler(self):
                 args=['-scale-to', '512', 'paper.pdf', 'filename'])
 
   @needs_make('make')
-  @no_wasm64('MEMORY64 does not yet support SJLJ')
   @is_slow_test
   def test_openjpeg(self):
     def line_splitter(data):
@@ -6853,6 +6852,7 @@ def line_splitter(data):
                            [Path('codec/CMakeFiles/j2k_to_image.dir/index.c.o'),
                             Path('codec/CMakeFiles/j2k_to_image.dir/convert.c.o'),
                             Path('codec/CMakeFiles/j2k_to_image.dir/__/common/color.c.o'),
+                            Path('codec/CMakeFiles/j2k_to_image.dir/__/common/getopt.c.o'),
                             Path('bin/libopenjpeg.a')],
                            configure=['cmake', '.'],
                            # configure_args=['--enable-tiff=no', '--enable-jp3d=no', '--enable-png=no'],
@@ -6890,21 +6890,19 @@ def image_compare(output):
       assert abs(true_mean - image_mean) < 0.01, [true_mean, image_mean]
       assert diff_mean < 0.01, diff_mean
 
-      return output
-
     self.emcc_args += ['--minify=0'] # to compare the versions
     self.emcc_args += ['--pre-js', 'pre.js']
 
-    self.do_runf('third_party/openjpeg/codec/j2k_to_image.c',
+    output = self.do_runf('third_party/openjpeg/codec/j2k_to_image.c',
                  'Successfully generated', # The real test for valid output is in image_compare
                  args='-i image.j2k -o image.raw'.split(),
                  emcc_args=['-sUSE_LIBPNG'],
                  libraries=lib,
                  includes=[test_file('third_party/openjpeg/libopenjpeg'),
                            test_file('third_party/openjpeg/codec'),
                            test_file('third_party/openjpeg/common'),
-                           Path(self.get_build_dir(), 'third_party/openjpeg')],
-                 output_nicerizer=image_compare)
+                           Path(self.get_build_dir(), 'third_party/openjpeg')])
+    image_compare(output)
 
   @also_with_standalone_wasm(impure=True)
   @no_asan('autodebug logging interferes with asan')

diff --git a/test/third_party/openjpeg/CMake/CheckHaveGetopt.cmake b/test/third_party/openjpeg/CMake/CheckHaveGetopt.cmake
@@ -1,13 +1,21 @@
 # Check if getopt is present:
 INCLUDE (${CMAKE_ROOT}/Modules/CheckIncludeFile.cmake)
 SET(DONT_HAVE_GETOPT 1)
-IF(UNIX) #I am pretty sure only *nix sys have this anyway
-  CHECK_INCLUDE_FILE("getopt.h" CMAKE_HAVE_GETOPT_H)
-  # Seems like we need the contrary:
-  IF(CMAKE_HAVE_GETOPT_H)
-    SET(DONT_HAVE_GETOPT 0)
-  ENDIF(CMAKE_HAVE_GETOPT_H)
-ENDIF(UNIX)
+
+## Always used the openjpeg version of getopt_long since the system
+## version has a differnet signature.  This was fixed in the more recent
+## upstream version of openjpeg:
+## https://github.com/uclouvain/openjpeg/commit/aba0e602
+##
+##
+## IF(UNIX) #I am pretty sure only *nix sys have this anyway
+##   CHECK_INCLUDE_FILE("getopt.h" CMAKE_HAVE_GETOPT_H)
+##   # Seems like we need the contrary:
+##   IF(CMAKE_HAVE_GETOPT_H)
+##     SET(DONT_HAVE_GETOPT 0)
+##   ENDIF(CMAKE_HAVE_GETOPT_H)
+## ENDIF(UNIX)
+##
 
 IF(DONT_HAVE_GETOPT)
   ADD_DEFINITIONS(-DDONT_HAVE_GETOPT)