Change cxxflags test to build in same env as gyp (+ test make instead of ninja)

test/cxxflags/gyptest-cxxflags.py

 #!/usr/bin/env python
 
 # Copyright (c) 2012 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 the use of the environment during regeneration when the gyp file
 changes, specifically via build of an executable with C++ flags specified by
 CXXFLAGS.
 
-In this test, gyp happens within a local environment, but build outside of it.
+In this test, gyp and build both run in same local environment.
+(Build with different environment has different results for some build
+systems and platforms.)
 """
 
 import TestGyp
 
-FORMATS = ('ninja',)
+# ninja fails on Windows; contrast with cflags test
+FORMATS = ('make',)
 
 test = TestGyp.TestGyp(formats=FORMATS)
 
-# We reset the environ after calling gyp. When the auto-regeneration happens,
-# the same define should be reused anyway.
 with TestGyp.LocalEnv({'CXXFLAGS': '-O0'}):
   test.run_gyp('cxxflags.gyp')
-
-test.build('cxxflags.gyp')
+  test.build('cxxflags.gyp')
 
 expect = """\
 Using no optimization flag
 """
 test.run_built_executable('cxxflags', stdout=expect)
 
 test.sleep()
 
 with TestGyp.LocalEnv({'CXXFLAGS': '-O2'}):
   test.run_gyp('cxxflags.gyp')
-
-test.build('cxxflags.gyp')
+  test.build('cxxflags.gyp')
 
 expect = """\
 Using an optimization flag
 """
 test.run_built_executable('cxxflags', stdout=expect)
 
 test.pass_test()