emscripten-core · sbc100 · Feb 10, 2025 · Feb 10, 2025
diff --git a/system/lib/libc/musl/src/stdio/fflush.c b/system/lib/libc/musl/src/stdio/fflush.c
@@ -34,22 +34,11 @@ int fflush(FILE *f)
 	}
 
 	/* If reading, sync position, per POSIX */
-#if __EMSCRIPTEN__
-	/* Handle failues of lseek, which can happen in emscripten, e.g. for stdin etc */
-	if (f->rpos != f->rend) {
-		if (f->seek(f, f->rpos-f->rend, SEEK_CUR) == 0) {
-			/* Clear read and write modes */
-			f->wpos = f->wbase = f->wend = 0;
-			f->rpos = f->rend = 0;
-		}
-	}
-#else
 	if (f->rpos != f->rend) f->seek(f, f->rpos-f->rend, SEEK_CUR);
 
 	/* Clear read and write modes */
 	f->wpos = f->wbase = f->wend = 0;
 	f->rpos = f->rend = 0;
-#endif
 
 	FUNLOCK(f);
 	return 0;

diff --git a/test/common.py b/test/common.py
@@ -1493,8 +1493,7 @@ def cleanup(line):
 
   def run_js(self, filename, engine=None, args=None,
              assert_returncode=0,
-             interleaved_output=True,
-             **kwargs):
+             interleaved_output=True):
     # use files, as PIPE can get too full and hang us
     stdout_file = self.in_dir('stdout')
     stderr_file = None
@@ -1516,8 +1515,7 @@ def run_js(self, filename, engine=None, args=None,
       jsrun.run_js(filename, engine, args,
                    stdout=stdout,
                    stderr=stderr,
-                   assert_returncode=assert_returncode,
-                   **kwargs)
+                   assert_returncode=assert_returncode)
     except subprocess.TimeoutExpired as e:
       timeout_error = e
     except subprocess.CalledProcessError as e:
@@ -1940,9 +1938,9 @@ def _build_and_run(self, filename, expected_output, args=None,
                      includes=None,
                      assert_returncode=0, assert_identical=False, assert_all=False,
                      check_for_error=True, force_c=False, emcc_args=None,
+                     interleaved_output=True,
                      regex=False,
-                     output_basename=None,
-                     **kwargs):
+                     output_basename=None):
     logger.debug(f'_build_and_run: {filename}')
 
     if no_build:
@@ -1966,7 +1964,9 @@ def _build_and_run(self, filename, expected_output, args=None,
     if len(engines) == 0:
       self.fail('No JS engine present to run this test with. Check %s and the paths therein.' % config.EM_CONFIG)
     for engine in engines:
-      js_output = self.run_js(js_file, engine, args, assert_returncode=assert_returncode, **kwargs)
+      js_output = self.run_js(js_file, engine, args,
+                              assert_returncode=assert_returncode,
+                              interleaved_output=interleaved_output)
       js_output = js_output.replace('\r\n', '\n')
       if expected_output:
         if type(expected_output) not in [list, tuple]:

diff --git a/test/jsrun.py b/test/jsrun.py
@@ -86,7 +86,7 @@ def require_engine(engine):
 def run_js(filename, engine, args=None,
            stdin=None, stdout=PIPE, stderr=None, cwd=None,
            full_output=False, assert_returncode=0, skip_check=False,
-           timeout=DEFAULT_TIMEOUT, **kwargs):
+           timeout=DEFAULT_TIMEOUT):
   """Execute javascript code generated by tests, with possible timeout."""
 
   # We used to support True here but we no longer do.  Assert here just in case.
@@ -96,7 +96,6 @@ def run_js(filename, engine, args=None,
     raise Exception('output file not found: ' + filename)
 
   command = make_command(os.path.abspath(filename), engine, args)
-  kwargs.setdefault('text', True)
   if common.EMTEST_VERBOSE:
     print(f"Running: '{shared.shlex_join(command)}'")
   try:
@@ -107,7 +106,7 @@ def run_js(filename, engine, args=None,
         stderr=stderr,
         cwd=cwd,
         timeout=timeout,
-        **kwargs)
+        universal_newlines=True)
   except Exception:
     # the failure may be because the engine is not present. show the proper
     # error in that case

diff --git a/test/other/codesize/test_codesize_cxx_ctors1.size b/test/other/codesize/test_codesize_cxx_ctors1.size
@@ -1 +1 @@
-129147
+129141
diff --git a/test/other/codesize/test_codesize_cxx_ctors2.size b/test/other/codesize/test_codesize_cxx_ctors2.size
@@ -1 +1 @@
-128559
+128553
diff --git a/test/other/codesize/test_codesize_cxx_except.size b/test/other/codesize/test_codesize_cxx_except.size
@@ -1 +1 @@
-170815
+170809
diff --git a/test/other/codesize/test_codesize_cxx_except_wasm.size b/test/other/codesize/test_codesize_cxx_except_wasm.size
@@ -1 +1 @@
-144523
+144517
diff --git a/test/other/codesize/test_codesize_cxx_except_wasm_legacy.size b/test/other/codesize/test_codesize_cxx_except_wasm_legacy.size
@@ -1 +1 @@
-142098
+142092
diff --git a/test/other/codesize/test_codesize_cxx_lto.size b/test/other/codesize/test_codesize_cxx_lto.size
@@ -1 +1 @@
-122099
+122093
diff --git a/test/other/codesize/test_codesize_cxx_mangle.size b/test/other/codesize/test_codesize_cxx_mangle.size
@@ -1 +1 @@
-232625
+232619
diff --git a/test/other/codesize/test_codesize_cxx_noexcept.size b/test/other/codesize/test_codesize_cxx_noexcept.size
@@ -1 +1 @@
-131710
+131704
diff --git a/test/other/codesize/test_codesize_cxx_wasmfs.size b/test/other/codesize/test_codesize_cxx_wasmfs.size
@@ -1 +1 @@
-169117
+169111
diff --git a/test/other/codesize/test_codesize_files_wasmfs.size b/test/other/codesize/test_codesize_files_wasmfs.size
@@ -1 +1 @@
-50055
+50049
diff --git a/test/other/codesize/test_codesize_hello_O0.size b/test/other/codesize/test_codesize_hello_O0.size
@@ -1 +1 @@
-15105
+15101
diff --git a/test/other/codesize/test_codesize_minimal_O0.size b/test/other/codesize/test_codesize_minimal_O0.size
@@ -1 +1 @@
-1160
+1156
diff --git a/test/other/test_stdin_fflush.c b/test/other/test_stdin_fflush.c
diff --git a/test/other/test_stdin_fflush.out b/test/other/test_stdin_fflush.out
diff --git a/test/other/test_unoptimized_code_size.wasm.size b/test/other/test_unoptimized_code_size.wasm.size
@@ -1 +1 @@
-15105
+15101
diff --git a/test/other/test_unoptimized_code_size_strict.wasm.size b/test/other/test_unoptimized_code_size_strict.wasm.size
@@ -1 +1 @@
-15105
+15101
diff --git a/test/test_other.py b/test/test_other.py
@@ -1730,11 +1730,6 @@ def test_module_stdin(self):
     self.emcc_args += ['--pre-js', 'pre.js']
     self.do_runf('module/test_stdin.c', 'hello, world!')
 
-  @crossplatform
-  def test_stdin_fflush(self):
-    # Force text=False here so that newlines are not treated differently on windows.
-    self.do_other_test('test_stdin_fflush.c', input=b'foo\nbar\n', text=False)
-
   @crossplatform
   def test_module_stdout_stderr(self):
     self.set_setting('FORCE_FILESYSTEM')