Merge pull request #2256 from juj/more_musl1.14.1

More musl.

2 files changed, 4 insertions, 1 deletions

diff --git a/tests/core/test_strndup.out b/tests/core/test_strndup.out
index 681f00cc..f86db64e 100644
--- a/tests/core/test_strndup.out
+++ b/tests/core/test_strndup.out
@@ -3,4 +3,4 @@
 3:strndup - duplicate a specific number of bytes from a string
 4:strndup - duplicate a specific number of bytes from a string
 5:strndup - duplicate
-6:
+6:strndup - duplicate a specific number of bytes from a string
diff --git a/tests/test_core.py b/tests/test_core.py
index a1fcc3da..d5b855b9 100644
--- a/tests/test_core.py
+++ b/tests/test_core.py
@@ -988,6 +988,7 @@ class T(RunnerCore): # Short name, to make it more fun to use manually on the co
     self.do_run_from_file(src, output)
 
   def test_strndup(self):
+    if self.run_name.startswith('s_'): return self.skip('musl libc strndup() assumes that C strings can be loaded via i16 and i32 loads.')
     test_path = path_from_root('tests', 'core', 'test_strndup')
     src, output = (test_path + s for s in ('.in', '.out'))
 
@@ -3766,6 +3767,7 @@ int main()
     self.do_run_from_file(src, output)
 
   def test_strstr(self):
+    if self.run_name.startswith('s_'): return self.skip('musl libc strstr() assumes that C strings can be loaded via i16 and i32 loads.')
     test_path = path_from_root('tests', 'core', 'test_strstr')
     src, output = (test_path + s for s in ('.in', '.out'))
 
@@ -4276,6 +4278,7 @@ def process(filename):
     self.do_run(src, expected, extra_emscripten_args=['-H', 'libc/unistd.h'])
 
   def test_unistd_ttyname(self):
+    if self.run_name.startswith('s_'): return self.skip('musl libc strstr() assumes that C strings can be loaded via i16 and i32 loads.')
     src = open(path_from_root('tests', 'unistd', 'ttyname.c'), 'r').read()
     self.do_run(src, 'success', force_c=True)