Update a couple tests for make functionality (working as intended).

test/subdirectory/gyptest-subdir-default.py

 #!/usr/bin/env python
 
 # Copyright (c) 2009 Google Inc. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """
 Verifies building a subsidiary dependent target from a .gyp file in a
 subdirectory, without specifying an explicit output build directory,
 and using the subdirectory's solution or project file as the entry point.
 """
 
 import TestGyp
+import errno
 
 test = TestGyp.TestGyp()
 
 test.run_gyp('prog1.gyp', chdir='src')
 
 test.relocate('src', 'relocate/src')
 
-test.build('prog2.gyp', chdir='relocate/src/subdir')
+chdir = 'relocate/src/subdir'
 
-test.must_not_exist('relocate/src/prog1'+test._exe)
+# Make can build sub-projects, but it's still through the top-level Makefile,
+# and there is no 'default' or 'all' sub-project, so the target must be
+# explicit.
+# TODO(mmoss) Should make create self-contained, sub-project Makefiles,
+# equilvalent to the sub-project .sln/SConstruct/etc. files of other generators?
+if test.format == 'make':
+  chdir = 'relocate/src'
+  test.build('prog2.gyp', 'prog2', chdir=chdir)
+else:
+  test.build('prog2.gyp', chdir=chdir)
+
+# 'prog1' shouldn't have been built, so it should throw a 'No such file or
+# directory' exception. If it does exist, running it should fail the stdout
+# match. This is clunky, but it's arguably less fragile than looking for the
+# different platform/generator-dependent paths.
+try:
+  test.run_built_executable('prog1',
+                            chdir=chdir,
+                            stdout="")
+except OSError, e:
+  if e.errno != errno.ENOENT:
+    raise e
 
 test.run_built_executable('prog2',
-                          chdir='relocate/src/subdir',
+                          chdir=chdir,
                           stdout="Hello from prog2.c\n")
 
 test.pass_test()