Revert r1978 and r1979

pylib/gyp/generator/ninja_test.py

Index: pylib/gyp/generator/ninja_test.py
diff --git a/pylib/gyp/generator/ninja_test.py b/pylib/gyp/generator/ninja_test.py
index 1767b2f45a04caff792ffd469358f0565558cc38..52661bcdf093ba0cb592235c4eb2a34c39f31507 100644
--- a/pylib/gyp/generator/ninja_test.py
+++ b/pylib/gyp/generator/ninja_test.py
@@ -15,18 +15,15 @@ import TestCommon
 
 class TestPrefixesAndSuffixes(unittest.TestCase):
   def test_BinaryNamesWindows(self):
-    # These cannot run on non-Windows as they require a VS installation to
-    # correctly handle variable expansion.
-    if sys.platform.startswith('win'):
-      writer = ninja.NinjaWriter('foo', 'wee', '.', '.', 'build.ninja', '.',
-          'build.ninja', 'win')
-      spec = { 'target_name': 'wee' }
-      self.assertTrue(writer.ComputeOutputFileName(spec, 'executable').
-          endswith('.exe'))
-      self.assertTrue(writer.ComputeOutputFileName(spec, 'shared_library').
-          endswith('.dll'))
-      self.assertTrue(writer.ComputeOutputFileName(spec, 'static_library').
-          endswith('.lib'))
+    writer = ninja.NinjaWriter('foo', 'wee', '.', '.', 'build.ninja', '.',
+        'build.ninja', 'win')
+    spec = { 'target_name': 'wee' }
+    self.assertTrue(writer.ComputeOutputFileName(spec, 'executable').
+        endswith('.exe'))
+    self.assertTrue(writer.ComputeOutputFileName(spec, 'shared_library').
+        endswith('.dll'))
+    self.assertTrue(writer.ComputeOutputFileName(spec, 'static_library').
+        endswith('.lib'))
 
   def test_BinaryNamesLinux(self):
     writer = ninja.NinjaWriter('foo', 'wee', '.', '.', 'build.ninja', '.',