[test] Track gzipped file size in code size tests. NFC (#20874)

sbc100 · web-flow · commit 86eacffd3aa2 · 2023-12-07T14:15:19.000-08:00
diff --git a/test/other/metadce/test_metadce_cxx_ctors1.gzsize b/test/other/metadce/test_metadce_cxx_ctors1.gzsize
@@ -0,0 +1 @@
+10013
diff --git a/test/other/metadce/test_metadce_cxx_ctors2.gzsize b/test/other/metadce/test_metadce_cxx_ctors2.gzsize
@@ -0,0 +1 @@
+9995
diff --git a/test/other/metadce/test_metadce_cxx_except.gzsize b/test/other/metadce/test_metadce_cxx_except.gzsize
@@ -0,0 +1 @@
+11121
diff --git a/test/other/metadce/test_metadce_cxx_except_wasm.gzsize b/test/other/metadce/test_metadce_cxx_except_wasm.gzsize
@@ -0,0 +1 @@
+9927
diff --git a/test/other/metadce/test_metadce_cxx_mangle.gzsize b/test/other/metadce/test_metadce_cxx_mangle.gzsize
@@ -0,0 +1 @@
+11129
diff --git a/test/other/metadce/test_metadce_cxx_noexcept.gzsize b/test/other/metadce/test_metadce_cxx_noexcept.gzsize
@@ -0,0 +1 @@
+10013
diff --git a/test/other/metadce/test_metadce_cxx_wasmfs.gzsize b/test/other/metadce/test_metadce_cxx_wasmfs.gzsize
@@ -0,0 +1 @@
+5307
diff --git a/test/other/metadce/test_metadce_files_js_fs.gzsize b/test/other/metadce/test_metadce_files_js_fs.gzsize
@@ -0,0 +1 @@
+7900
diff --git a/test/other/metadce/test_metadce_files_wasmfs.gzsize b/test/other/metadce/test_metadce_files_wasmfs.gzsize
@@ -0,0 +1 @@
+3197
diff --git a/test/other/metadce/test_metadce_hello_O0.gzsize b/test/other/metadce/test_metadce_hello_O0.gzsize
@@ -0,0 +1 @@
+8457
diff --git a/test/other/metadce/test_metadce_hello_O1.gzsize b/test/other/metadce/test_metadce_hello_O1.gzsize
@@ -0,0 +1 @@
+3048
diff --git a/test/other/metadce/test_metadce_hello_O2.gzsize b/test/other/metadce/test_metadce_hello_O2.gzsize
@@ -0,0 +1 @@
+2688
diff --git a/test/other/metadce/test_metadce_hello_O3.gzsize b/test/other/metadce/test_metadce_hello_O3.gzsize
@@ -0,0 +1 @@
+2606
diff --git a/test/other/metadce/test_metadce_hello_Os.gzsize b/test/other/metadce/test_metadce_hello_Os.gzsize
@@ -0,0 +1 @@
+2606
diff --git a/test/other/metadce/test_metadce_hello_Oz.gzsize b/test/other/metadce/test_metadce_hello_Oz.gzsize
@@ -0,0 +1 @@
+2588
diff --git a/test/other/metadce/test_metadce_hello_dylink.gzsize b/test/other/metadce/test_metadce_hello_dylink.gzsize
@@ -0,0 +1 @@
+6551
diff --git a/test/other/metadce/test_metadce_hello_export_nothing.gzsize b/test/other/metadce/test_metadce_hello_export_nothing.gzsize
@@ -0,0 +1 @@
+1959
diff --git a/test/other/metadce/test_metadce_hello_wasmfs.gzsize b/test/other/metadce/test_metadce_hello_wasmfs.gzsize
@@ -0,0 +1 @@
+2606
diff --git a/test/other/metadce/test_metadce_libcxxabi_message_O3.gzsize b/test/other/metadce/test_metadce_libcxxabi_message_O3.gzsize
@@ -0,0 +1 @@
+2192
diff --git a/test/other/metadce/test_metadce_libcxxabi_message_O3_standalone.gzsize b/test/other/metadce/test_metadce_libcxxabi_message_O3_standalone.gzsize
@@ -0,0 +1 @@
+2229
diff --git a/test/other/metadce/test_metadce_mem_O3.gzsize b/test/other/metadce/test_metadce_mem_O3.gzsize
@@ -0,0 +1 @@
+2648
diff --git a/test/other/metadce/test_metadce_mem_O3_grow.gzsize b/test/other/metadce/test_metadce_mem_O3_grow.gzsize
@@ -0,0 +1 @@
+2810
diff --git a/test/other/metadce/test_metadce_mem_O3_grow_standalone.gzsize b/test/other/metadce/test_metadce_mem_O3_grow_standalone.gzsize
@@ -0,0 +1 @@
+2500
diff --git a/test/other/metadce/test_metadce_mem_O3_standalone.gzsize b/test/other/metadce/test_metadce_mem_O3_standalone.gzsize
@@ -0,0 +1 @@
+2468
diff --git a/test/other/metadce/test_metadce_mem_O3_standalone_lib.gzsize b/test/other/metadce/test_metadce_mem_O3_standalone_lib.gzsize
@@ -0,0 +1 @@
+2213
diff --git a/test/other/metadce/test_metadce_mem_O3_standalone_narg.gzsize b/test/other/metadce/test_metadce_mem_O3_standalone_narg.gzsize
@@ -0,0 +1 @@
+2229
diff --git a/test/other/metadce/test_metadce_mem_O3_standalone_narg_flto.gzsize b/test/other/metadce/test_metadce_mem_O3_standalone_narg_flto.gzsize
@@ -0,0 +1 @@
+2229
diff --git a/test/other/metadce/test_metadce_minimal_64.gzsize b/test/other/metadce/test_metadce_minimal_64.gzsize
@@ -0,0 +1 @@
+1772
diff --git a/test/other/metadce/test_metadce_minimal_O0.gzsize b/test/other/metadce/test_metadce_minimal_O0.gzsize
@@ -0,0 +1 @@
+7295
diff --git a/test/other/metadce/test_metadce_minimal_O1.gzsize b/test/other/metadce/test_metadce_minimal_O1.gzsize
@@ -0,0 +1 @@
+1859
diff --git a/test/other/metadce/test_metadce_minimal_O2.gzsize b/test/other/metadce/test_metadce_minimal_O2.gzsize
@@ -0,0 +1 @@
+1687
diff --git a/test/other/metadce/test_metadce_minimal_O3.gzsize b/test/other/metadce/test_metadce_minimal_O3.gzsize
@@ -0,0 +1 @@
+1646
diff --git a/test/other/metadce/test_metadce_minimal_Os.gzsize b/test/other/metadce/test_metadce_minimal_Os.gzsize
@@ -0,0 +1 @@
+1646
diff --git a/test/other/metadce/test_metadce_minimal_Os_mr.gzsize b/test/other/metadce/test_metadce_minimal_Os_mr.gzsize
@@ -0,0 +1 @@
+269
diff --git a/test/other/metadce/test_metadce_minimal_Oz-ctors.gzsize b/test/other/metadce/test_metadce_minimal_Oz-ctors.gzsize
@@ -0,0 +1 @@
+1637
diff --git a/test/other/metadce/test_metadce_minimal_Oz.gzsize b/test/other/metadce/test_metadce_minimal_Oz.gzsize
@@ -0,0 +1 @@
+1646
diff --git a/test/other/metadce/test_metadce_minimal_pthreads.gzsize b/test/other/metadce/test_metadce_minimal_pthreads.gzsize
@@ -0,0 +1 @@
+5034
diff --git a/test/other/metadce/test_metadce_minimal_wasmfs.gzsize b/test/other/metadce/test_metadce_minimal_wasmfs.gzsize
@@ -0,0 +1 @@
+1646
diff --git a/test/test_other.py b/test/test_other.py
@@ -203,6 +203,15 @@ 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
+
+
 class other(RunnerCore):
   def assertIsObjectFile(self, filename):
     self.assertTrue(building.is_wasm(filename))
@@ -8218,11 +8227,14 @@ def run_metadce_test(self, filename, args=[], expected_exists=[], expected_not_e
       wasm_size = os.path.getsize('a.out.nodebug.wasm')
       size_file = expected_basename + '.size'
       js_size = os.path.getsize('a.out.js')
+      gz_size = get_file_gzipped_size('a.out.js')
       if '-pthread' in args:
         js_size += os.path.getsize('a.out.worker.js')
       js_size_file = expected_basename + '.jssize'
+      gz_size_file = expected_basename + '.gzsize'
       self.check_expected_size_in_file('wasm', size_file, wasm_size)
       self.check_expected_size_in_file('js', js_size_file, js_size)
+      self.check_expected_size_in_file('gz', gz_size_file, gz_size)
 
     imports, exports, funcs = self.parse_wasm('a.out.wasm')
     imports.sort()
@@ -10546,14 +10558,6 @@ def print_percent(actual, expected):
     print(shared.shlex_join(args))
     self.run_process(args)
 
-    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
-
     # For certain tests, don't just check the output size but check
     # the full JS output matches the expectations.  That means that
     # any change that touches those core lines of output will need
