From b69fe9921e8a9dbed540cdfe6497c877611ee10c Mon Sep 17 00:00:00 2001 From: Ingvar Stepanyan Date: Fri, 20 Jun 2025 02:40:33 +0100 Subject: [PATCH] [test] Measure gzip sizes without metadata. NFC Writing to a temporary gzip file, measuring and then deleting is both inefficient, but also results in a slightly larger reported size because it then also writes extra metadata like the original filename. That metadata is not something we care about measuring, as more often than not compression on the Web happens on the fly anyway. --- test/code_size/audio_worklet_wasm.json | 8 ++++---- test/code_size/embind_hello_wasm.json | 8 ++++---- test/code_size/embind_val_wasm.json | 8 ++++---- test/code_size/hello_wasm_worker_wasm.json | 8 ++++---- test/code_size/hello_webgl2_wasm.json | 8 ++++---- test/code_size/hello_webgl2_wasm2js.json | 6 +++--- test/code_size/hello_webgl_wasm.json | 8 ++++---- test/code_size/hello_webgl_wasm2js.json | 6 +++--- test/code_size/hello_world_wasm.json | 8 ++++---- test/code_size/hello_world_wasm2js.json | 6 +++--- test/code_size/math_wasm.json | 8 ++++---- test/code_size/random_printf_wasm.json | 4 ++-- test/code_size/random_printf_wasm2js.json | 4 ++-- .../codesize/test_codesize_cxx_ctors1.gzsize | 2 +- .../codesize/test_codesize_cxx_ctors2.gzsize | 2 +- .../codesize/test_codesize_cxx_except.gzsize | 2 +- .../test_codesize_cxx_except_wasm.gzsize | 2 +- .../test_codesize_cxx_except_wasm_legacy.gzsize | 2 +- .../other/codesize/test_codesize_cxx_lto.gzsize | 2 +- .../codesize/test_codesize_cxx_mangle.gzsize | 2 +- .../codesize/test_codesize_cxx_noexcept.gzsize | 2 +- .../codesize/test_codesize_cxx_wasmfs.gzsize | 2 +- .../codesize/test_codesize_files_js_fs.gzsize | 2 +- .../codesize/test_codesize_files_wasmfs.gzsize | 2 +- .../codesize/test_codesize_hello_O0.gzsize | 2 +- .../codesize/test_codesize_hello_O1.gzsize | 2 +- .../codesize/test_codesize_hello_O2.gzsize | 2 +- .../codesize/test_codesize_hello_O3.gzsize | 2 +- .../codesize/test_codesize_hello_Os.gzsize | 2 +- .../codesize/test_codesize_hello_Oz.gzsize | 2 +- .../codesize/test_codesize_hello_dylink.gzsize | 2 +- .../test_codesize_hello_export_nothing.gzsize | 2 +- .../test_codesize_hello_single_file.gzsize | 2 +- .../codesize/test_codesize_hello_wasmfs.gzsize | 2 +- .../test_codesize_libcxxabi_message_O3.gzsize | 2 +- ...esize_libcxxabi_message_O3_standalone.gzsize | 2 +- test/other/codesize/test_codesize_mem_O3.gzsize | 2 +- .../codesize/test_codesize_mem_O3_grow.gzsize | 2 +- .../test_codesize_mem_O3_grow_standalone.gzsize | 2 +- .../test_codesize_mem_O3_standalone.gzsize | 2 +- .../test_codesize_mem_O3_standalone_lib.gzsize | 2 +- .../test_codesize_mem_O3_standalone_narg.gzsize | 2 +- ..._codesize_mem_O3_standalone_narg_flto.gzsize | 2 +- .../codesize/test_codesize_minimal_64.gzsize | 2 +- .../codesize/test_codesize_minimal_O0.gzsize | 2 +- .../codesize/test_codesize_minimal_O1.gzsize | 2 +- .../codesize/test_codesize_minimal_O2.gzsize | 2 +- .../codesize/test_codesize_minimal_O3.gzsize | 2 +- .../codesize/test_codesize_minimal_Os.gzsize | 2 +- .../codesize/test_codesize_minimal_Os_mr.gzsize | 2 +- .../test_codesize_minimal_Oz-ctors.gzsize | 2 +- .../codesize/test_codesize_minimal_Oz.gzsize | 2 +- .../codesize/test_codesize_minimal_esm.gzsize | 2 +- .../test_codesize_minimal_pthreads.gzsize | 2 +- ...t_codesize_minimal_pthreads_memgrowth.gzsize | 2 +- .../test_codesize_minimal_wasmfs.gzsize | 2 +- test/test_other.py | 17 ++++++----------- 57 files changed, 94 insertions(+), 99 deletions(-) diff --git a/test/code_size/audio_worklet_wasm.json b/test/code_size/audio_worklet_wasm.json index eea010648c42d..9648aff3d49a7 100644 --- a/test/code_size/audio_worklet_wasm.json +++ b/test/code_size/audio_worklet_wasm.json @@ -1,10 +1,10 @@ { "a.html": 519, - "a.html.gz": 364, + "a.html.gz": 357, "a.js": 3853, - "a.js.gz": 2050, + "a.js.gz": 2045, "a.wasm": 1288, - "a.wasm.gz": 867, + "a.wasm.gz": 860, "total": 5660, - "total_gz": 3281 + "total_gz": 3262 } diff --git a/test/code_size/embind_hello_wasm.json b/test/code_size/embind_hello_wasm.json index e0d0528b85c2d..d1e02488d6135 100644 --- a/test/code_size/embind_hello_wasm.json +++ b/test/code_size/embind_hello_wasm.json @@ -1,10 +1,10 @@ { "a.html": 552, - "a.html.gz": 380, + "a.html.gz": 373, "a.js": 7266, - "a.js.gz": 3321, + "a.js.gz": 3316, "a.wasm": 7294, - "a.wasm.gz": 3346, + "a.wasm.gz": 3339, "total": 15112, - "total_gz": 7047 + "total_gz": 7028 } diff --git a/test/code_size/embind_val_wasm.json b/test/code_size/embind_val_wasm.json index a59db19966412..d7ce5ba198c81 100644 --- a/test/code_size/embind_val_wasm.json +++ b/test/code_size/embind_val_wasm.json @@ -1,10 +1,10 @@ { "a.html": 552, - "a.html.gz": 380, + "a.html.gz": 373, "a.js": 5367, - "a.js.gz": 2540, + "a.js.gz": 2535, "a.wasm": 7468, - "a.wasm.gz": 3468, + "a.wasm.gz": 3461, "total": 13387, - "total_gz": 6388 + "total_gz": 6369 } diff --git a/test/code_size/hello_wasm_worker_wasm.json b/test/code_size/hello_wasm_worker_wasm.json index b5e8b1476b786..9a2aff9988d6c 100644 --- a/test/code_size/hello_wasm_worker_wasm.json +++ b/test/code_size/hello_wasm_worker_wasm.json @@ -1,10 +1,10 @@ { "a.html": 519, - "a.html.gz": 364, + "a.html.gz": 357, "a.js": 830, - "a.js.gz": 530, + "a.js.gz": 525, "a.wasm": 1885, - "a.wasm.gz": 1079, + "a.wasm.gz": 1072, "total": 3234, - "total_gz": 1973 + "total_gz": 1954 } diff --git a/test/code_size/hello_webgl2_wasm.json b/test/code_size/hello_webgl2_wasm.json index f66ff4d1ca742..63935941cae59 100644 --- a/test/code_size/hello_webgl2_wasm.json +++ b/test/code_size/hello_webgl2_wasm.json @@ -1,10 +1,10 @@ { "a.html": 454, - "a.html.gz": 328, + "a.html.gz": 321, "a.js": 4386, - "a.js.gz": 2252, + "a.js.gz": 2247, "a.wasm": 8278, - "a.wasm.gz": 5627, + "a.wasm.gz": 5620, "total": 13118, - "total_gz": 8207 + "total_gz": 8188 } diff --git a/test/code_size/hello_webgl2_wasm2js.json b/test/code_size/hello_webgl2_wasm2js.json index 2e6068eeb212b..84f34dd90087c 100644 --- a/test/code_size/hello_webgl2_wasm2js.json +++ b/test/code_size/hello_webgl2_wasm2js.json @@ -1,8 +1,8 @@ { "a.html": 346, - "a.html.gz": 262, + "a.html.gz": 255, "a.js": 18103, - "a.js.gz": 9771, + "a.js.gz": 9766, "total": 18449, - "total_gz": 10033 + "total_gz": 10021 } diff --git a/test/code_size/hello_webgl_wasm.json b/test/code_size/hello_webgl_wasm.json index 337555ae0e026..db6865bcf2357 100644 --- a/test/code_size/hello_webgl_wasm.json +++ b/test/code_size/hello_webgl_wasm.json @@ -1,10 +1,10 @@ { "a.html": 454, - "a.html.gz": 328, + "a.html.gz": 321, "a.js": 3924, - "a.js.gz": 2092, + "a.js.gz": 2087, "a.wasm": 8278, - "a.wasm.gz": 5627, + "a.wasm.gz": 5620, "total": 12656, - "total_gz": 8047 + "total_gz": 8028 } diff --git a/test/code_size/hello_webgl_wasm2js.json b/test/code_size/hello_webgl_wasm2js.json index f7e13afe1e948..66833d85b4bcb 100644 --- a/test/code_size/hello_webgl_wasm2js.json +++ b/test/code_size/hello_webgl_wasm2js.json @@ -1,8 +1,8 @@ { "a.html": 346, - "a.html.gz": 262, + "a.html.gz": 255, "a.js": 17630, - "a.js.gz": 9603, + "a.js.gz": 9598, "total": 17976, - "total_gz": 9865 + "total_gz": 9853 } diff --git a/test/code_size/hello_world_wasm.json b/test/code_size/hello_world_wasm.json index 8ac4fc86d0cd6..8950f0d3407b5 100644 --- a/test/code_size/hello_world_wasm.json +++ b/test/code_size/hello_world_wasm.json @@ -1,10 +1,10 @@ { "a.html": 552, - "a.html.gz": 380, + "a.html.gz": 373, "a.js": 287, - "a.js.gz": 247, + "a.js.gz": 242, "a.wasm": 95, - "a.wasm.gz": 108, + "a.wasm.gz": 101, "total": 934, - "total_gz": 735 + "total_gz": 716 } diff --git a/test/code_size/hello_world_wasm2js.json b/test/code_size/hello_world_wasm2js.json index 334058b414501..17b64e9973b30 100644 --- a/test/code_size/hello_world_wasm2js.json +++ b/test/code_size/hello_world_wasm2js.json @@ -1,8 +1,8 @@ { "a.html": 323, - "a.html.gz": 253, + "a.html.gz": 246, "a.js": 965, - "a.js.gz": 593, + "a.js.gz": 588, "total": 1288, - "total_gz": 846 + "total_gz": 834 } diff --git a/test/code_size/math_wasm.json b/test/code_size/math_wasm.json index 0baeeb4cb0883..f43453a495907 100644 --- a/test/code_size/math_wasm.json +++ b/test/code_size/math_wasm.json @@ -1,10 +1,10 @@ { "a.html": 552, - "a.html.gz": 380, + "a.html.gz": 373, "a.js": 110, - "a.js.gz": 125, + "a.js.gz": 120, "a.wasm": 2678, - "a.wasm.gz": 1655, + "a.wasm.gz": 1648, "total": 3340, - "total_gz": 2160 + "total_gz": 2141 } diff --git a/test/code_size/random_printf_wasm.json b/test/code_size/random_printf_wasm.json index fe57d6f3a4cef..89da22d7c8c3a 100644 --- a/test/code_size/random_printf_wasm.json +++ b/test/code_size/random_printf_wasm.json @@ -1,6 +1,6 @@ { "a.html": 12511, - "a.html.gz": 6855, + "a.html.gz": 6848, "total": 12511, - "total_gz": 6855 + "total_gz": 6848 } diff --git a/test/code_size/random_printf_wasm2js.json b/test/code_size/random_printf_wasm2js.json index 87d6dfdb9ad86..5b21705c95275 100644 --- a/test/code_size/random_printf_wasm2js.json +++ b/test/code_size/random_printf_wasm2js.json @@ -1,6 +1,6 @@ { "a.html": 17224, - "a.html.gz": 7558, + "a.html.gz": 7551, "total": 17224, - "total_gz": 7558 + "total_gz": 7551 } diff --git a/test/other/codesize/test_codesize_cxx_ctors1.gzsize b/test/other/codesize/test_codesize_cxx_ctors1.gzsize index 24aca551b4a92..0183d1ba0b24d 100644 --- a/test/other/codesize/test_codesize_cxx_ctors1.gzsize +++ b/test/other/codesize/test_codesize_cxx_ctors1.gzsize @@ -1 +1 @@ -8171 +8162 diff --git a/test/other/codesize/test_codesize_cxx_ctors2.gzsize b/test/other/codesize/test_codesize_cxx_ctors2.gzsize index 9f96f52ae75be..03d9f66c63191 100644 --- a/test/other/codesize/test_codesize_cxx_ctors2.gzsize +++ b/test/other/codesize/test_codesize_cxx_ctors2.gzsize @@ -1 +1 @@ -8160 +8151 diff --git a/test/other/codesize/test_codesize_cxx_except.gzsize b/test/other/codesize/test_codesize_cxx_except.gzsize index be6b7db3622b4..b243533c30d91 100644 --- a/test/other/codesize/test_codesize_cxx_except.gzsize +++ b/test/other/codesize/test_codesize_cxx_except.gzsize @@ -1 +1 @@ -9159 +9150 diff --git a/test/other/codesize/test_codesize_cxx_except_wasm.gzsize b/test/other/codesize/test_codesize_cxx_except_wasm.gzsize index 7516f462d51d8..3f7a9f0ac3a1b 100644 --- a/test/other/codesize/test_codesize_cxx_except_wasm.gzsize +++ b/test/other/codesize/test_codesize_cxx_except_wasm.gzsize @@ -1 +1 @@ -8119 +8110 diff --git a/test/other/codesize/test_codesize_cxx_except_wasm_legacy.gzsize b/test/other/codesize/test_codesize_cxx_except_wasm_legacy.gzsize index 7516f462d51d8..3f7a9f0ac3a1b 100644 --- a/test/other/codesize/test_codesize_cxx_except_wasm_legacy.gzsize +++ b/test/other/codesize/test_codesize_cxx_except_wasm_legacy.gzsize @@ -1 +1 @@ -8119 +8110 diff --git a/test/other/codesize/test_codesize_cxx_lto.gzsize b/test/other/codesize/test_codesize_cxx_lto.gzsize index f9590eeca8c22..20989ae74120d 100644 --- a/test/other/codesize/test_codesize_cxx_lto.gzsize +++ b/test/other/codesize/test_codesize_cxx_lto.gzsize @@ -1 +1 @@ -8023 +8014 diff --git a/test/other/codesize/test_codesize_cxx_mangle.gzsize b/test/other/codesize/test_codesize_cxx_mangle.gzsize index 06dcbb22123df..2bd210f66d323 100644 --- a/test/other/codesize/test_codesize_cxx_mangle.gzsize +++ b/test/other/codesize/test_codesize_cxx_mangle.gzsize @@ -1 +1 @@ -9176 +9167 diff --git a/test/other/codesize/test_codesize_cxx_noexcept.gzsize b/test/other/codesize/test_codesize_cxx_noexcept.gzsize index 24aca551b4a92..0183d1ba0b24d 100644 --- a/test/other/codesize/test_codesize_cxx_noexcept.gzsize +++ b/test/other/codesize/test_codesize_cxx_noexcept.gzsize @@ -1 +1 @@ -8171 +8162 diff --git a/test/other/codesize/test_codesize_cxx_wasmfs.gzsize b/test/other/codesize/test_codesize_cxx_wasmfs.gzsize index 0c4967be2312a..2c8f9ceb7bfb1 100644 --- a/test/other/codesize/test_codesize_cxx_wasmfs.gzsize +++ b/test/other/codesize/test_codesize_cxx_wasmfs.gzsize @@ -1 +1 @@ -3355 +3346 diff --git a/test/other/codesize/test_codesize_files_js_fs.gzsize b/test/other/codesize/test_codesize_files_js_fs.gzsize index d11cf0e2103c9..0edce5513b734 100644 --- a/test/other/codesize/test_codesize_files_js_fs.gzsize +++ b/test/other/codesize/test_codesize_files_js_fs.gzsize @@ -1 +1 @@ -7485 +7476 diff --git a/test/other/codesize/test_codesize_files_wasmfs.gzsize b/test/other/codesize/test_codesize_files_wasmfs.gzsize index 8ee7f9390e715..c882b49a4f5e0 100644 --- a/test/other/codesize/test_codesize_files_wasmfs.gzsize +++ b/test/other/codesize/test_codesize_files_wasmfs.gzsize @@ -1 +1 @@ -2606 +2597 diff --git a/test/other/codesize/test_codesize_hello_O0.gzsize b/test/other/codesize/test_codesize_hello_O0.gzsize index 9c8bcfc9f63d7..64da164cfd67e 100644 --- a/test/other/codesize/test_codesize_hello_O0.gzsize +++ b/test/other/codesize/test_codesize_hello_O0.gzsize @@ -1 +1 @@ -8319 +8310 diff --git a/test/other/codesize/test_codesize_hello_O1.gzsize b/test/other/codesize/test_codesize_hello_O1.gzsize index 7f5add1bcb81f..408e4f9ca334a 100644 --- a/test/other/codesize/test_codesize_hello_O1.gzsize +++ b/test/other/codesize/test_codesize_hello_O1.gzsize @@ -1 +1 @@ -2496 +2487 diff --git a/test/other/codesize/test_codesize_hello_O2.gzsize b/test/other/codesize/test_codesize_hello_O2.gzsize index 8b4d1684b31db..6b16d006faa0f 100644 --- a/test/other/codesize/test_codesize_hello_O2.gzsize +++ b/test/other/codesize/test_codesize_hello_O2.gzsize @@ -1 +1 @@ -2157 +2148 diff --git a/test/other/codesize/test_codesize_hello_O3.gzsize b/test/other/codesize/test_codesize_hello_O3.gzsize index 7b9be0d42126b..281e3d99811c2 100644 --- a/test/other/codesize/test_codesize_hello_O3.gzsize +++ b/test/other/codesize/test_codesize_hello_O3.gzsize @@ -1 +1 @@ -2119 +2110 diff --git a/test/other/codesize/test_codesize_hello_Os.gzsize b/test/other/codesize/test_codesize_hello_Os.gzsize index 7b9be0d42126b..281e3d99811c2 100644 --- a/test/other/codesize/test_codesize_hello_Os.gzsize +++ b/test/other/codesize/test_codesize_hello_Os.gzsize @@ -1 +1 @@ -2119 +2110 diff --git a/test/other/codesize/test_codesize_hello_Oz.gzsize b/test/other/codesize/test_codesize_hello_Oz.gzsize index 2ff4149843110..23e07fb71b3f9 100644 --- a/test/other/codesize/test_codesize_hello_Oz.gzsize +++ b/test/other/codesize/test_codesize_hello_Oz.gzsize @@ -1 +1 @@ -1921 +1912 diff --git a/test/other/codesize/test_codesize_hello_dylink.gzsize b/test/other/codesize/test_codesize_hello_dylink.gzsize index 582e5b29c4c30..bccc9f90f3338 100644 --- a/test/other/codesize/test_codesize_hello_dylink.gzsize +++ b/test/other/codesize/test_codesize_hello_dylink.gzsize @@ -1 +1 @@ -11482 +11473 diff --git a/test/other/codesize/test_codesize_hello_export_nothing.gzsize b/test/other/codesize/test_codesize_hello_export_nothing.gzsize index fcd64c90dc0b9..131de0bdc4713 100644 --- a/test/other/codesize/test_codesize_hello_export_nothing.gzsize +++ b/test/other/codesize/test_codesize_hello_export_nothing.gzsize @@ -1 +1 @@ -1508 +1499 diff --git a/test/other/codesize/test_codesize_hello_single_file.gzsize b/test/other/codesize/test_codesize_hello_single_file.gzsize index d0ee287550f10..8643b83ce87c8 100644 --- a/test/other/codesize/test_codesize_hello_single_file.gzsize +++ b/test/other/codesize/test_codesize_hello_single_file.gzsize @@ -1 +1 @@ -3632 +3623 diff --git a/test/other/codesize/test_codesize_hello_wasmfs.gzsize b/test/other/codesize/test_codesize_hello_wasmfs.gzsize index 7b9be0d42126b..281e3d99811c2 100644 --- a/test/other/codesize/test_codesize_hello_wasmfs.gzsize +++ b/test/other/codesize/test_codesize_hello_wasmfs.gzsize @@ -1 +1 @@ -2119 +2110 diff --git a/test/other/codesize/test_codesize_libcxxabi_message_O3.gzsize b/test/other/codesize/test_codesize_libcxxabi_message_O3.gzsize index 1f61070df464c..6aec59a6d0cad 100644 --- a/test/other/codesize/test_codesize_libcxxabi_message_O3.gzsize +++ b/test/other/codesize/test_codesize_libcxxabi_message_O3.gzsize @@ -1 +1 @@ -1696 +1687 diff --git a/test/other/codesize/test_codesize_libcxxabi_message_O3_standalone.gzsize b/test/other/codesize/test_codesize_libcxxabi_message_O3_standalone.gzsize index 57bf58ca801bf..d75c403cfc3eb 100644 --- a/test/other/codesize/test_codesize_libcxxabi_message_O3_standalone.gzsize +++ b/test/other/codesize/test_codesize_libcxxabi_message_O3_standalone.gzsize @@ -1 +1 @@ -1727 +1718 diff --git a/test/other/codesize/test_codesize_mem_O3.gzsize b/test/other/codesize/test_codesize_mem_O3.gzsize index 6881443e13a16..37a8c942bc967 100644 --- a/test/other/codesize/test_codesize_mem_O3.gzsize +++ b/test/other/codesize/test_codesize_mem_O3.gzsize @@ -1 +1 @@ -2134 +2125 diff --git a/test/other/codesize/test_codesize_mem_O3_grow.gzsize b/test/other/codesize/test_codesize_mem_O3_grow.gzsize index cc6f0ac7ecffd..eb8c15407016f 100644 --- a/test/other/codesize/test_codesize_mem_O3_grow.gzsize +++ b/test/other/codesize/test_codesize_mem_O3_grow.gzsize @@ -1 +1 @@ -2283 +2274 diff --git a/test/other/codesize/test_codesize_mem_O3_grow_standalone.gzsize b/test/other/codesize/test_codesize_mem_O3_grow_standalone.gzsize index ba478ebc2e112..1cb1a4d287cee 100644 --- a/test/other/codesize/test_codesize_mem_O3_grow_standalone.gzsize +++ b/test/other/codesize/test_codesize_mem_O3_grow_standalone.gzsize @@ -1 +1 @@ -1997 +1988 diff --git a/test/other/codesize/test_codesize_mem_O3_standalone.gzsize b/test/other/codesize/test_codesize_mem_O3_standalone.gzsize index 812722cb803f6..291e0b2304bc9 100644 --- a/test/other/codesize/test_codesize_mem_O3_standalone.gzsize +++ b/test/other/codesize/test_codesize_mem_O3_standalone.gzsize @@ -1 +1 @@ -1963 +1954 diff --git a/test/other/codesize/test_codesize_mem_O3_standalone_lib.gzsize b/test/other/codesize/test_codesize_mem_O3_standalone_lib.gzsize index f345fc69cb6e1..36dd03b4b55f2 100644 --- a/test/other/codesize/test_codesize_mem_O3_standalone_lib.gzsize +++ b/test/other/codesize/test_codesize_mem_O3_standalone_lib.gzsize @@ -1 +1 @@ -1719 +1710 diff --git a/test/other/codesize/test_codesize_mem_O3_standalone_narg.gzsize b/test/other/codesize/test_codesize_mem_O3_standalone_narg.gzsize index 57bf58ca801bf..d75c403cfc3eb 100644 --- a/test/other/codesize/test_codesize_mem_O3_standalone_narg.gzsize +++ b/test/other/codesize/test_codesize_mem_O3_standalone_narg.gzsize @@ -1 +1 @@ -1727 +1718 diff --git a/test/other/codesize/test_codesize_mem_O3_standalone_narg_flto.gzsize b/test/other/codesize/test_codesize_mem_O3_standalone_narg_flto.gzsize index 57bf58ca801bf..d75c403cfc3eb 100644 --- a/test/other/codesize/test_codesize_mem_O3_standalone_narg_flto.gzsize +++ b/test/other/codesize/test_codesize_mem_O3_standalone_narg_flto.gzsize @@ -1 +1 @@ -1727 +1718 diff --git a/test/other/codesize/test_codesize_minimal_64.gzsize b/test/other/codesize/test_codesize_minimal_64.gzsize index c686973f9b155..837dd962a1922 100644 --- a/test/other/codesize/test_codesize_minimal_64.gzsize +++ b/test/other/codesize/test_codesize_minimal_64.gzsize @@ -1 +1 @@ -1267 +1258 diff --git a/test/other/codesize/test_codesize_minimal_O0.gzsize b/test/other/codesize/test_codesize_minimal_O0.gzsize index b411359393386..0eb9fe5aeac52 100644 --- a/test/other/codesize/test_codesize_minimal_O0.gzsize +++ b/test/other/codesize/test_codesize_minimal_O0.gzsize @@ -1 +1 @@ -6614 +6605 diff --git a/test/other/codesize/test_codesize_minimal_O1.gzsize b/test/other/codesize/test_codesize_minimal_O1.gzsize index 7ae5be655b033..0718dd8e65f4e 100644 --- a/test/other/codesize/test_codesize_minimal_O1.gzsize +++ b/test/other/codesize/test_codesize_minimal_O1.gzsize @@ -1 +1 @@ -1329 +1320 diff --git a/test/other/codesize/test_codesize_minimal_O2.gzsize b/test/other/codesize/test_codesize_minimal_O2.gzsize index 34a5f9bcac300..c3e05c83ccfe6 100644 --- a/test/other/codesize/test_codesize_minimal_O2.gzsize +++ b/test/other/codesize/test_codesize_minimal_O2.gzsize @@ -1 +1 @@ -1197 +1188 diff --git a/test/other/codesize/test_codesize_minimal_O3.gzsize b/test/other/codesize/test_codesize_minimal_O3.gzsize index 1bb44860b72f3..ff7ff4d075c63 100644 --- a/test/other/codesize/test_codesize_minimal_O3.gzsize +++ b/test/other/codesize/test_codesize_minimal_O3.gzsize @@ -1 +1 @@ -1163 +1154 diff --git a/test/other/codesize/test_codesize_minimal_Os.gzsize b/test/other/codesize/test_codesize_minimal_Os.gzsize index 1bb44860b72f3..ff7ff4d075c63 100644 --- a/test/other/codesize/test_codesize_minimal_Os.gzsize +++ b/test/other/codesize/test_codesize_minimal_Os.gzsize @@ -1 +1 @@ -1163 +1154 diff --git a/test/other/codesize/test_codesize_minimal_Os_mr.gzsize b/test/other/codesize/test_codesize_minimal_Os_mr.gzsize index ae4cf41b213a3..a1f7f63f15dbb 100644 --- a/test/other/codesize/test_codesize_minimal_Os_mr.gzsize +++ b/test/other/codesize/test_codesize_minimal_Os_mr.gzsize @@ -1 +1 @@ -307 +298 diff --git a/test/other/codesize/test_codesize_minimal_Oz-ctors.gzsize b/test/other/codesize/test_codesize_minimal_Oz-ctors.gzsize index 8966a606466f2..91d0f8a3f5153 100644 --- a/test/other/codesize/test_codesize_minimal_Oz-ctors.gzsize +++ b/test/other/codesize/test_codesize_minimal_Oz-ctors.gzsize @@ -1 +1 @@ -1147 +1138 diff --git a/test/other/codesize/test_codesize_minimal_Oz.gzsize b/test/other/codesize/test_codesize_minimal_Oz.gzsize index 1bb44860b72f3..ff7ff4d075c63 100644 --- a/test/other/codesize/test_codesize_minimal_Oz.gzsize +++ b/test/other/codesize/test_codesize_minimal_Oz.gzsize @@ -1 +1 @@ -1163 +1154 diff --git a/test/other/codesize/test_codesize_minimal_esm.gzsize b/test/other/codesize/test_codesize_minimal_esm.gzsize index c738463c27798..39ccce4049fa0 100644 --- a/test/other/codesize/test_codesize_minimal_esm.gzsize +++ b/test/other/codesize/test_codesize_minimal_esm.gzsize @@ -1 +1 @@ -1249 +1240 diff --git a/test/other/codesize/test_codesize_minimal_pthreads.gzsize b/test/other/codesize/test_codesize_minimal_pthreads.gzsize index 6a49307c8e8e7..1aa3c9b40c24a 100644 --- a/test/other/codesize/test_codesize_minimal_pthreads.gzsize +++ b/test/other/codesize/test_codesize_minimal_pthreads.gzsize @@ -1 +1 @@ -3744 +3735 diff --git a/test/other/codesize/test_codesize_minimal_pthreads_memgrowth.gzsize b/test/other/codesize/test_codesize_minimal_pthreads_memgrowth.gzsize index 6377daa10b88a..5f115dbfc05f6 100644 --- a/test/other/codesize/test_codesize_minimal_pthreads_memgrowth.gzsize +++ b/test/other/codesize/test_codesize_minimal_pthreads_memgrowth.gzsize @@ -1 +1 @@ -3950 +3941 diff --git a/test/other/codesize/test_codesize_minimal_wasmfs.gzsize b/test/other/codesize/test_codesize_minimal_wasmfs.gzsize index 1bb44860b72f3..ff7ff4d075c63 100644 --- a/test/other/codesize/test_codesize_minimal_wasmfs.gzsize +++ b/test/other/codesize/test_codesize_minimal_wasmfs.gzsize @@ -1 +1 @@ -1163 +1154 diff --git a/test/test_other.py b/test/test_other.py index a42a2ba95c2cc..fd6567e0d868a 100644 --- a/test/test_other.py +++ b/test/test_other.py @@ -226,13 +226,10 @@ def llvm_nm(file): return symbols -def get_file_gzipped_size(f): - f_gz = f + '.gz' - with gzip.open(f_gz, 'wb') as gzf: - gzf.write(read_binary(f)) - size = os.path.getsize(f_gz) - delete_file(f_gz) - return size +def get_file_and_gz_sizes(f): + contents = read_binary(f) + gz_contents = gzip.compress(contents) + return len(contents), len(gz_contents) def deminify_syms(names, minification_map): @@ -9322,8 +9319,7 @@ def run_codesize_test(self, filename, cflags, check_funcs=True, check_full_js=Fa self.run_process(build_cmd + ['--profiling-funcs', '--closure=1']) - js_size = os.path.getsize('a.out.js') - gz_size = get_file_gzipped_size('a.out.js') + js_size, gz_size = get_file_and_gz_sizes('a.out.js') js_size_file = expected_basename + '.jssize' gz_size_file = expected_basename + '.gzsize' self.check_expected_size_in_file('js', js_size_file, js_size) @@ -11962,8 +11958,7 @@ def print_percent(actual, expected): f_gz = f + '.gz' expected_size = expected_results[f] if f in expected_results else float('inf') expected_size_gz = expected_results[f_gz] if f_gz in expected_results else float('inf') - size = os.path.getsize(f) - size_gz = get_file_gzipped_size(f) + size, size_gz = get_file_and_gz_sizes(f) obtained_results[f] = size obtained_results[f_gz] = size_gz