More fixes for PNaCl Windows.

tests/pnacl_abi/nacl.scons

 # -*- python -*-
 # Copyright 2010 The Native Client Authors.  All rights reserved.
 # Use of this source code is governed by a BSD-style license that can
 # be found in the LICENSE file.
 
 Import('env')
 
 # These tests only make sense for the PNaCl toolchain
 if not env.Bit('bitcode'):
   Return()
 
 # we do not have llvm's ${DISASS} when we run on ARM boxes
 if env.Bit('target_arm'):
   Return()
 
 TESTS = ['small_structs_by_value.c',
          'data_type.c',
          ## 'vaarg.c',## todo(jasonwkim) comment out - upstream changes break this test
          ]
 
 for src in TESTS:
    name = src.split('.')[0]
    node = env.ComponentObject(name + '.o', src)
    test = env.CommandTest(name + '.out',
-                          ['${DISASS} -o -', node],
+                          ['${DISASS}', '-o', '-', node],
                           stdout_golden=env.File(name + '.stdout'),
-                          filter_regex="'; ModuleID = '",
+                          filter_regex='"; ModuleID = "',
                           filter_inverse='true',
                           )
    env.AddNodeToTestSuite(test,
                           ['pnacl_abi_tests', 'small_tests'],
                           'run_' + name + '_test')