Update test code to handle new SDKs that include all libraries

scripts/test.py

diff --git a/scripts/test.py b/scripts/test.py
index e1194d0..b638703 100755
--- a/scripts/test.py
+++ b/scripts/test.py
@@ -95,31 +95,20 @@
 
 
 def test_lib_building(emcc, use_asmjs_optimizer):
-  def test_build(args, expected=None, unexpected=None):
+  # We ship pre-built libraries as part of the emsdk package so we don't
+  # expect to see any library building when we use the SDK
+  unexpected = ['generating system library: ', 'generating system asset: ']
+
+  def test_build(args):
     checked_call_with_output(emcc + ' hello_world.c' + args,
-                             expected=expected,
                              unexpected=unexpected,
                              stderr=subprocess.STDOUT)
 
-  # by default we ship libc, struct_info, and the asm.js optimizer, as they
-  # are important for various reasons (libc takes a long time to build;
-  # struct_info is a bootstrap product so if the user's setup is broken it's
-  # confusing; the asm.js optimizer is a native application so it needs a
-  # working native local build environment). otherwise we don't ship every
-  # single lib, so some building is expected on first run.
 
-  unexpected_system_libs = ['generating system library: libc.',
-                            'generating system asset: optimizer']
-  if use_asmjs_optimizer:
-    unexpected_system_libs += ['generating system asset: generated_struct_info.json']
-
-  first_time_system_libs = ['generating system library: libdlmalloc.']
-
-  test_build('', expected=first_time_system_libs,
-             unexpected=unexpected_system_libs)
-  test_build(' -O2', unexpected=unexpected_system_libs + first_time_system_libs)
-  test_build(' -s WASM=0', unexpected=unexpected_system_libs + first_time_system_libs)
-  test_build(' -O2 -s WASM=0', unexpected=unexpected_system_libs + first_time_system_libs)
+  test_build('')
+  test_build(' -O2')
+  test_build(' -s WASM=0')
+  test_build(' -O2 -s WASM=0')
 
 
 def run_emsdk(cmd):