@@ -913,14 +913,18 @@ def test_emstrip(self):
913913 # would take 10 minutes+ to finish (CMake feature detection is slow), so
914914 # combine multiple features into one to try to cover as much as possible
915915 # while still keeping this test in sensible time limit.
916- 'js': ('target_js', 'test_cmake.js', ['-DCMAKE_BUILD_TYPE=Debug']),
917- 'html': ('target_html', 'hello_world_gles.html', ['-DCMAKE_BUILD_TYPE=Release']),
918- 'library': ('target_library', 'libtest_cmake.a', ['-DCMAKE_BUILD_TYPE=MinSizeRel']),
919- 'static_cpp': ('target_library', 'libtest_cmake.a', ['-DCMAKE_BUILD_TYPE=RelWithDebInfo', '-DCPP_LIBRARY_TYPE=STATIC']),
920- 'stdproperty': ('stdproperty', 'helloworld.js', []),
921- 'post_build': ('post_build', 'hello.js', []),
916+ 'js': ('target_js', 'test_cmake.js', ['-DCMAKE_BUILD_TYPE=Debug']),
917+ 'html': ('target_html', 'hello_world_gles.html', ['-DCMAKE_BUILD_TYPE=Release']),
918+ 'library': ('target_library', 'libtest_cmake.a', ['-DCMAKE_BUILD_TYPE=MinSizeRel']),
919+ 'static_cpp': ('target_library', 'libtest_cmake.a', ['-DCMAKE_BUILD_TYPE=RelWithDebInfo', '-DCPP_LIBRARY_TYPE=STATIC']),
920+ 'whole_archive': ('whole_archive', 'whole.js', []),
921+ 'stdproperty': ('stdproperty', 'helloworld.js', []),
922+ 'post_build': ('post_build', 'hello.js', []),
922923 })
923924 def test_cmake(self, test_dir, output_file, cmake_args):
925+ if test_dir == 'whole_archive' and 'EMTEST_SKIP_NEW_CMAKE' in os.environ:
926+ self.skipTest('EMTEST_SKIP_NEW_CMAKE set')
927+
924928 # Test all supported generators.
925929 if WINDOWS:
926930 generators = ['MinGW Makefiles', 'NMake Makefiles']
0 commit comments