 ===================================================================
 --- test/lib/TestGyp.py	(revision 857)
 +++ test/lib/TestGyp.py	(working copy)
-@@ -391,6 +391,44 @@
+@@ -391,6 +391,45 @@
      return self.workpath(*result)
  
  

+    return self.workpath(*result)
+
+  def up_to_date(self, gyp_file, target=None, **kw):
+    kw['stdout'] = "no work to do\n"
+    return self.build(gyp_file, target, **kw)
+
+
 class TestGypMSVS(TestGypBase):
   """
   Subclass for testing the GYP Visual Studio generator.
@@ -670,6 +708,7 @@
   TestGypGypd,
   TestGypMake,
   TestGypMSVS,

+    # libraries go into shared library dir, and everything else
+    # goes into the normal place.
+    if spec['type'] in ('executable', 'loadable_module'):
+      return os.path.join('$b/', filename)
+    elif spec['type'] == 'shared_library':
+      return os.path.join('$b/lib', filename)
+    else:
+      return self.OutputPath(filename)
+
