make action_dependencies test win32 and c89 friendly

test/ninja/action_dependencies/gyptest-action-dependencies.py

Index: test/ninja/action_dependencies/gyptest-action-dependencies.py
===================================================================
--- test/ninja/action_dependencies/gyptest-action-dependencies.py	(revision 1210)
+++ test/ninja/action_dependencies/gyptest-action-dependencies.py	(working copy)
@@ -9,6 +9,8 @@
 dependent targets, but not the targets themselves.
 """
 
+import os
+import sys
 import TestGyp
 
 # NOTE(piman): This test will not work with other generators because:
@@ -25,21 +27,28 @@
 chdir = 'relocate/src'
 test.relocate('src', chdir)
 
-test.build('action_dependencies.gyp', 'obj/b.b.o', chdir=chdir)
+# TODO(cross-compile)

[Evan Martin, 2012/02/21 00:55:55]

normal argument for TODO is who should do that work.  so TODO: cross-compile, or
TODO(scottmg): cross-compile, or just leave this out because I don't know what
it means

+objext = '.obj' if sys.platform == 'win32' else '.o'
 
+test.build('action_dependencies.gyp',
+           os.path.join('obj', 'b.b' + objext),
+           chdir=chdir)
+
 # The 'a' actions should be run (letting b.c compile), but the a static library
 # should not be built.
 test.built_file_must_not_exist('a', type=test.STATIC_LIB, chdir=chdir)
 test.built_file_must_not_exist('b', type=test.STATIC_LIB, chdir=chdir)
-test.built_file_must_exist('obj/b.b.o', chdir=chdir)
+test.built_file_must_exist(os.path.join('obj', 'b.b' + objext), chdir=chdir)
 
-test.build('action_dependencies.gyp', 'obj/c.c.o', chdir=chdir)
+test.build('action_dependencies.gyp',
+           os.path.join('obj', 'c.c' + objext),
+           chdir=chdir)
 
 # 'a' and 'b' should be built, so that the 'c' action succeeds, letting c.c
 # compile
 test.built_file_must_exist('a', type=test.STATIC_LIB, chdir=chdir)
 test.built_file_must_exist('b', type=test.EXECUTABLE, chdir=chdir)
-test.built_file_must_exist('obj/c.c.o', chdir=chdir)
+test.built_file_must_exist(os.path.join('obj', 'c.c' + objext), chdir=chdir)
 
 
 test.pass_test()