11 files changed, 140 insertions, 57 deletions
diff --git a/tests/emscripten_api_browser2.cpp b/tests/emscripten_api_browser2.cpp
new file mode 100644
index 00000000..569ed710
--- /dev/null
+++ b/tests/emscripten_api_browser2.cpp
@@ -0,0 +1,53 @@
+#include <stdio.h>
+#include <string.h>
+#include <assert.h>
+
+#include<emscripten.h>
+
+int value = 0;
+
+extern "C" {
+  void set(int x) {
+    printf("set! %d\n", x);
+    value = x;
+  }
+}
+
+void load2() {
+  printf("load2\n");
+
+  char buffer[10];
+  memset(buffer, 0, 10);
+  FILE *f = fopen("file1.txt", "r");
+  fread(buffer, 1, 5, f);
+  fclose(f);
+  assert(strcmp(buffer, "first") == 0);
+
+  memset(buffer, 0, 10);
+  f = fopen("file2.txt", "r");
+  fread(buffer, 1, 6, f);
+  fclose(f);
+  assert(strcmp(buffer, "second") == 0);
+
+  int result = 1;
+  REPORT_RESULT();
+}
+void error2() {
+  printf("fail2\n");
+}
+
+void load1() {
+  printf("load1\n");
+  assert(value == 456);
+  emscripten_async_load_script("script2.js", load2, error2);
+}
+void error1() {
+  printf("fail1\n");
+}
+
+int main() {
+  emscripten_async_load_script("script1.js", load1, error1);
+
+  return 1;
+}
+
diff --git a/tests/enet/unix.c b/tests/enet/unix.c
index a225b57d..292eb29b 100644
--- a/tests/enet/unix.c
+++ b/tests/enet/unix.c
@@ -80,7 +80,7 @@ enet_address_set_host (ENetAddress * address, const char * name)
     char buffer [2048];
     int errnum;
 
-#if defined(linux) || defined(__linux) || defined(__linux__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+#if defined(linux) || defined(__linux) || defined(__linux__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__EMSCRIPTEN__)
     gethostbyname_r (name, & hostData, buffer, sizeof (buffer), & hostEntry, & errnum);
 #else
     hostEntry = gethostbyname_r (name, & hostData, buffer, sizeof (buffer), & errnum);
@@ -133,7 +133,7 @@ enet_address_get_host (const ENetAddress * address, char * name, size_t nameLeng
 
     in.s_addr = address -> host;
 
-#if defined(linux) || defined(__linux) || defined(__linux__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+#if defined(linux) || defined(__linux) || defined(__linux__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__EMSCRIPTEN__)
     gethostbyaddr_r ((char *) & in, sizeof (struct in_addr), AF_INET, & hostData, buffer, sizeof (buffer), & hostEntry, & errnum);
 #else
     hostEntry = gethostbyaddr_r ((char *) & in, sizeof (struct in_addr), AF_INET, & hostData, buffer, sizeof (buffer), & errnum);
diff --git a/tests/python/readme.md b/tests/python/readme.md
new file mode 100644
index 00000000..e728dce3
--- /dev/null
+++ b/tests/python/readme.md
@@ -0,0 +1,59 @@
+Building Python with Emscripten
+===============================
+
+These directions should work for Python 2.7.x (last tested with 2.7.5).
+
+First, uncompress Python into two separate directories, one for native
+and one for JavaScript.
+
+In the JavaScript directory, do:
+
+````
+    EMCONFIGURE_JS=1 emconfigure ./configure --without-threads --without-pymalloc --enable-shared --disable-ipv6
+````
+
+If you are on Mac OS X, you will also want ``disable-toolbox-glue``.
+If you are on an older version of Python (such as 2.7.2), you may
+not need the ``--disable-ipv6`` option.
+
+If you are on Python 2.7.4 or later, you will need to edit the
+``Makefile`` generated and remove the ``MULTIARCH=`` line(s).
+You will also need to edit ``pyconfig.h`` and remove defines
+for ``DOUBLE_IS_BIG_ENDIAN_IEEE754``, ``DOUBLE_IS_ARM_MIXED_ENDIAN_IEEE754``,
+and ``HAVE_GCC_ASM_FOR_X87``.
+
+On Python 2.7.2, you will need to edit ``pyconfig.h`` and remove
+``HAVE_GCC_ASM_FOR_X87``, ``HAVE_SIG*`` except for ``SIGNAL_H``
+and *add* ``#define PY_NO_SHORT_FLOAT_REPR``.
+
+Now, you can run ``make``. It will fail trying to run ``pgen``.
+
+At this point, go to your native directory and run:
+
+````
+./configure --without-threads --without-pymalloc --enable-shared --disable-ipv6
+````
+
+Now, run ``make`` in the native directory and then copy the generated ``Parser/pgen``
+to your JavaScript directory. Back in your JavaScript directory, be sure to flag
+the ``pgen`` executable as executable:
+
+````
+chmod +x Parser/pgen
+````
+
+Now, run ``make`` again.
+
+You will get an error about trying to run ``python`` or ``python.exe``. This
+can be ignored.
+
+Now, you can link the bitcode file that you need:
+
+````
+llvm-link libpython2.7.so Modules/python.o -o python.bc
+````
+
+If you are on Mac OS X, you will want to look for ``libpython2.7.dylib``
+instead of ``libpython2.7.so``.
+
+Thanks to rasjidw and everyone else who has helped with this!
diff --git a/tests/python/readme.txt b/tests/python/readme.txt
deleted file mode 100644
index 31b0ff45..00000000
--- a/tests/python/readme.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-Updates to Python 2.7.4 and emscripten of Arp 29 2013 with le32
-
-Go to js dir, run EMCONFIGURE_JS=1 ~/Dev/emscripten/emconfigure ./configure --without-threads --without-pymalloc --enable-shared --disable-ipv6
-clean out MULTIARCH= in Makefile
-make, until error on pgen
-Go to native, run ./configure --without-threads --without-pymalloc --enable-shared --disable-ipv6
-cp Parser/pgen ../JS_DIR/Parser
-return to JS
-chmod +x Parser/pgen
-remove #defines of  DOUBLE_IS_BIG_ENDIAN_IEEE754 and DOUBLE_IS_ARM_MIXED_ENDIAN_IEEE754 and HAVE_GCC_ASM_FOR_X87 in pyconfig.h
-make
-link libpython2.7.so with Modules/python.o to get the bitcode file you want
-
-=========================
-
-
-This is Python 2.7.2, compiled to .bc as follows:
-
-Uncompress Python into two separate directories, one for native and one for JS.
-
-In the JS one, do
-  emconfigure ./configure --without-threads --without-pymalloc --enable-shared
-  EDIT pyconfig.h, remove
-    HAVE_GCC_ASM_FOR_X87
-    HAVE_SIG* except SIGNAL_H
-  and *add*
-    #define PY_NO_SHORT_FLOAT_REPR
-  make
-It will fail on lack of permissions to run Parser/pgen.
-
-Go to the native one, do
-  ./configure --without-threads --without-pymalloc
-  make
-  (Note: you don't need to let it complete, just enough for Parse/pgen is sufficient.)
-  cp Parser/pgen ../YOUR_JS_DIR/Parser/
-
-Return to the JS one, do
-  chmod +x Parser/pgen
-  make
-You will get an error on lack of permissions to run ./python. Ignore that, and do
-  llvm-link libpython2.7.so python -o python.bc
-
-That's it!
-
-Thanks to rasjidw for helping with this!
-
diff --git a/tests/sockets/test_gethostbyname.c b/tests/sockets/test_gethostbyname.c
index de7da706..459c6b98 100644
--- a/tests/sockets/test_gethostbyname.c
+++ b/tests/sockets/test_gethostbyname.c
@@ -13,12 +13,17 @@
 
 int main() {
   char str[INET_ADDRSTRLEN];
+  struct hostent *host = NULL;
+  struct hostent hostData;
   struct in_addr addr;
   const char *res;
+  char buffer[2048];
   int err;
   
-  // resolve the hostname ot an actual address
-  struct hostent *host = gethostbyname("slashdot.org");
+  // gethostbyname_r calls the same stuff as gethostbyname, so we'll test the
+  // more complicated one.
+  // resolve the hostname to an actual address
+  gethostbyname_r("slashdot.org", &hostData, buffer, sizeof(buffer), &host, &err);
   assert(host->h_addrtype == AF_INET);
   assert(host->h_length == sizeof(uint32_t));
 
diff --git a/tests/test_browser.py b/tests/test_browser.py
index e6fd6544..6a23b41c 100644
--- a/tests/test_browser.py
+++ b/tests/test_browser.py
@@ -1230,6 +1230,17 @@ keydown(100);keyup(100); // trigger the end
   def test_emscripten_api(self):
     self.btest('emscripten_api_browser.cpp', '1', args=['-s', '''EXPORTED_FUNCTIONS=['_main', '_third']'''])
 
+  def test_emscripten_api2(self):
+    open('script1.js', 'w').write('''
+      Module._set(456);
+    ''')
+
+    open('file1.txt', 'w').write('first');
+    open('file2.txt', 'w').write('second');
+    Popen([PYTHON, FILE_PACKAGER, 'test.data', '--preload', 'file1.txt', 'file2.txt'], stdout=open('script2.js', 'w')).communicate()
+
+    self.btest('emscripten_api_browser2.cpp', '1', args=['-s', '''EXPORTED_FUNCTIONS=['_main', '_set']'''])
+
   def test_emscripten_api_infloop(self):
     self.btest('emscripten_api_browser_infloop.cpp', '7')
 
diff --git a/tests/test_core.py b/tests/test_core.py
index d499b6a9..a882ab59 100644
--- a/tests/test_core.py
+++ b/tests/test_core.py
@@ -1431,6 +1431,7 @@ Succeeded!
       self.do_run(src, 'BUG?\nDisplay: Vu=465.100000  Vv=465.200000  Wu=160.300000  Wv=111.400000')
 
   def test_math(self):
+      if Settings.USE_TYPED_ARRAYS != 2: return self.skip('requires ta2')
       src = '''
         #include <stdio.h>
         #include <stdlib.h>
diff --git a/tests/test_other.py b/tests/test_other.py
index 64be60fa..b11f22e5 100644
--- a/tests/test_other.py
+++ b/tests/test_other.py
@@ -1755,7 +1755,7 @@ $
 other=ay file...
 seeked= file.
 ''', output[0])
-    self.assertIdentical('texte\n', output[1])
+    self.assertContained('texte\n', output[1])
 
   def test_emconfig(self):
     output = Popen([PYTHON, EMCONFIG, 'LLVM_ROOT'], stdout=PIPE, stderr=PIPE).communicate()[0].strip()
diff --git a/tests/test_sanity.py b/tests/test_sanity.py
index 4188afff..6fdf5ddd 100644
--- a/tests/test_sanity.py
+++ b/tests/test_sanity.py
@@ -478,7 +478,7 @@ fi
         (['--jcache'], 'hello_malloc.cpp', False, True, False, True, False, True, []),
         ([], 'hello_malloc.cpp', False, False, False, False, False, False, []),
         # new, huge file
-        ([], 'hello_libcxx.cpp', False, False, False, False, False, False, ('3 chunks',)),
+        ([], 'hello_libcxx.cpp', False, False, False, False, False, False, ('4 chunks',)),
         (['--jcache'], 'hello_libcxx.cpp', True, False, True, False, True, False, []),
         (['--jcache'], 'hello_libcxx.cpp', False, True, False, True, False, True, []),
         ([], 'hello_libcxx.cpp', False, False, False, False, False, False, []),
diff --git a/tests/unistd/login.out b/tests/unistd/login.out
index 50e850ae..c1919c3c 100644
--- a/tests/unistd/login.out
+++ b/tests/unistd/login.out
@@ -3,7 +3,7 @@ errno: 0
 
 gethostname/2 ret: -1
 gethostname/2: em------------------------
-errno: 91
+errno: 36
 
 gethostname/256 ret: 0
 gethostname/256: emscripten
diff --git a/tests/unistd/misc.out b/tests/unistd/misc.out
index 8f03f688..ae641d57 100644
--- a/tests/unistd/misc.out
+++ b/tests/unistd/misc.out
@@ -11,8 +11,8 @@ lockf(good): 0, errno: 0
 lockf(bad): -1, errno: 9
 nice: 0, errno: 1
 pause: -1, errno: 4
-pipe(good): -1, errno: 88
-pipe(bad): -1, errno: 88
+pipe(good): -1, errno: 38
+pipe(bad): -1, errno: 38
 execl: -1, errno: 8
 execle: -1, errno: 8
 execlp: -1, errno: 8
@@ -29,8 +29,8 @@ alarm: 0, errno: 0
 ualarm: 0, errno: 0
 fork: -1, errno: 11
 vfork: -1, errno: 11
-crypt: (null), errno: 88
-encrypt, errno: 88
+crypt: (null), errno: 38
+encrypt, errno: 38
 getgid: 0, errno: 0
 getegid: 0, errno: 0
 getuid: 0, errno: 0