Follow up review on emscripten-core#13296.

Author: juj

tests/core/test_dyncalls.js

@@ -2,22 +2,22 @@ mergeInto(LibraryManager.library, {
   test_dyncalls_vijdf: function(funcPtr) {
     // 1. Directly access a function pointer via a static signature (32-bit ABI)
     //    (this is the fastest way to call a function pointer when the signature is statically known in WASM_BIGINT==0 builds)
-    dynCall_vijdf(funcPtr, 1, /*lo=*/2, /*hi=*/3, 4, 5); // Available only in WASM_BIGINT != 2 builds
+    dynCall_vijdf(funcPtr, 1, /*lo=*/2, /*hi=*/3, 4, 5); // Available only in DYNCALLS==1 builds
 
     // 2. Access a function pointer using the convenience/legacy 'dynCall' function (32-bit ABI)
     //    (this form should never be used, it is suboptimal for performance, but provided for legacy compatibility)
-    dynCall('vijdf', funcPtr, [2, /*lo=*/3, /*hi=*/4, 5, 6]); // Available only in WASM_BIGINT != 2 builds
+    dynCall('vijdf', funcPtr, [2, /*lo=*/3, /*hi=*/4, 5, 6]); // Available only in DYNCALLS==1 builds
   },
 
   test_dyncalls_iii: function(funcPtr) {
     // 1. Directly access a function pointer via a static signature (32-bit ABI)
     //    (this is the fastest way to call a function pointer when the signature is statically known in WASM_BIGINT==0 builds)
-    var ret = dynCall_iii(funcPtr, 1, 2); // Available only in WASM_BIGINT != 2 builds
+    var ret = dynCall_iii(funcPtr, 1, 2); // Available only in DYNCALLS==1 builds
     console.log('iii returned ' + ret);
 
     // 2. Access a function pointer using the convenience/legacy 'dynCall' function (32-bit ABI)
     //    (this form should never be used, it is suboptimal for performance, but provided for legacy compatibility)
-    var ret = dynCall('iii', funcPtr, [2, 3]); // Available only in WASM_BIGINT != 2 builds
+    var ret = dynCall('iii', funcPtr, [2, 3]); // Available only in DYNCALLS==1 builds
     console.log('iii returned ' + ret);
 
     // 3. Access a dynCall using the makeDynCall macro:

tests/test_core.py

@@ -6289,12 +6289,12 @@ def test_dyncall_specific(self):
       self.set_setting('EXTRA_EXPORTED_RUNTIME_METHODS', exported_runtime_methods)
       self.do_run_in_out_file_test('tests', 'core', 'dyncall_specific.c')
 
-      self.set_setting('EXTRA_EXPORTED_RUNTIME_METHODS', [])
-      self.emcc_args = emcc_args + ['-s', 'DYNCALLS=1', '--js-library', path_from_root('tests', 'core', 'test_dyncalls.js')]
-      self.do_run_in_out_file_test('tests', 'core', 'test_dyncalls.c')
+    self.set_setting('EXTRA_EXPORTED_RUNTIME_METHODS', [])
+    self.emcc_args = emcc_args + ['-s', 'DYNCALLS=1', '--js-library', path_from_root('tests', 'core', 'test_dyncalls.js')]
+    self.do_run_in_out_file_test('tests', 'core', 'test_dyncalls.c')
 
-      self.emcc_args += ['-s', 'MINIMAL_RUNTIME=1', '-s', 'DEFAULT_LIBRARY_FUNCS_TO_INCLUDE=["$dynCall"]']
-      self.do_run_in_out_file_test('tests', 'core', 'test_dyncalls.c')
+    self.emcc_args += ['-s', 'MINIMAL_RUNTIME=1', '-s', 'DEFAULT_LIBRARY_FUNCS_TO_INCLUDE=["$dynCall"]']
+    self.do_run_in_out_file_test('tests', 'core', 'test_dyncalls.c')
 
   def test_getValue_setValue(self):
     # these used to be exported, but no longer are by default