added some more test and update ninja tool to handle commands

Author: dmoody256

src/engine/SCons/Tool/ninja.py

@@ -692,7 +692,7 @@ def generate(self, ninja_file):
 
             if "inputs" in build:
                 build["inputs"].sort()
-
+            
             ninja.build(**build)
 
         template_builds = dict()
@@ -990,7 +990,7 @@ def get_command(env, node, action):  # pylint: disable=too-many-branches
     comstr = get_comstr(sub_env, action, tlist, slist)
     if not comstr:
         return None
-
+    
     provider = __NINJA_RULE_MAPPING.get(comstr, get_shell_command)
     rule, variables = provider(sub_env, node, action, tlist, slist, executor=executor)
 
@@ -1478,6 +1478,17 @@ def ninja_file_depends_on_all(target, source, env):
         except AttributeError:
             pass
 
+    # We will subvert the normal Command to make sure all targets generated
+    # from commands will be linked to the ninja file
+    SconsCommand = SCons.Environment.Environment.Command
+
+    def NinjaCommand(self, target, source, action, **kw):
+        targets = SconsCommand(env, target, source, action, **kw)
+        env.Depends(ninja_file, targets)
+        return targets
+    
+    SCons.Environment.Environment.Command = NinjaCommand
+
     # Here we monkey patch the Task.execute method to not do a bunch of
     # unnecessary work. If a build is a regular builder (i.e not a conftest and
     # not our own Ninja builder) then we add it to the NINJA_STATE. Otherwise we

test/ninja/copy_function_command.py

@@ -0,0 +1,81 @@
+#!/usr/bin/env python
+#
+# __COPYRIGHT__
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
+
+import os
+import sys
+import TestSCons
+
+_python_ = TestSCons._python_
+_exe   = TestSCons._exe
+
+test = TestSCons.TestSCons()
+
+test.dir_fixture('ninja-fixture')
+
+ninja = test.where_is('ninja', os.environ['PATH'])
+
+if not ninja:
+    test.skip_test("Could not find ninja in environment")
+
+test.write('SConstruct', """
+env = Environment()
+env.Tool('ninja')
+env.Command('foo2.c', ['foo.c'], Copy('$TARGET','$SOURCE'))
+env.Program(target = 'foo', source = 'foo2.c')
+""")
+
+# generate simple build
+test.run(stdout=None)
+test.must_contain_all_lines(test.stdout(),
+    ['Generating: build.ninja', 'Executing: build.ninja'])
+test.run(program = test.workpath('foo'), stdout="foo.c" + os.linesep)
+
+# clean build and ninja files
+test.run(arguments='-c', stdout=None)
+test.must_contain_all_lines(test.stdout(), [
+    'Removed foo2.o',
+    'Removed foo2.c',
+    'Removed foo',
+    'Removed build.ninja'])
+
+# only generate the ninja file
+test.run(arguments='--disable-auto-ninja', stdout=None)
+test.must_contain_all_lines(test.stdout(),
+    ['Generating: build.ninja'])
+test.must_not_contain_any_line(test.stdout(),
+    ['Executing: build.ninja'])
+
+# run ninja independently
+test.run(program = ninja, stdout=None)
+test.run(program = test.workpath('foo'), stdout="foo.c" + os.linesep)
+
+test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:

test/ninja/CC.py renamed to test/ninja/generate_and_build.py

@@ -35,28 +35,41 @@
 
 test.dir_fixture('ninja-fixture')
 
+ninja = test.where_is('ninja', os.environ['PATH'])
+
+if not ninja:
+    test.skip_test("Could not find ninja in environment")
+
 test.write('SConstruct', """
 env = Environment()
 env.Tool('ninja')
 env.Program(target = 'foo', source = 'foo.c')
-""" % locals())
+""")
 
+# generate simple build
 test.run(stdout=None)
 test.must_contain_all_lines(test.stdout(),
     ['Generating: build.ninja', 'Executing: build.ninja'])
 test.run(program = test.workpath('foo'), stdout="foo.c" + os.linesep)
 
+# clean build and ninja files
 test.run(arguments='-c', stdout=None)
 test.must_contain_all_lines(test.stdout(), [
     'Removed foo.o',
     'Removed foo',
     'Removed build.ninja'])
+
+# only generate the ninja file
 test.run(arguments='--disable-auto-ninja', stdout=None)
 test.must_contain_all_lines(test.stdout(),
     ['Generating: build.ninja'])
 test.must_not_contain_any_line(test.stdout(),
     ['Executing: build.ninja'])
 
+# run ninja independently
+test.run(program = ninja, stdout=None)
+test.run(program = test.workpath('foo'), stdout="foo.c" + os.linesep)
+
 test.pass_test()
 
 # Local Variables:

test/ninja/shell_command.py

@@ -0,0 +1,83 @@
+#!/usr/bin/env python
+#
+# __COPYRIGHT__
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
+
+import os
+import sys
+import TestSCons
+
+_python_ = TestSCons._python_
+_exe   = TestSCons._exe
+
+test = TestSCons.TestSCons()
+
+test.dir_fixture('ninja-fixture')
+
+ninja = test.where_is('ninja', os.environ['PATH'])
+
+if not ninja:
+    test.skip_test("Could not find ninja in environment")
+
+test.write('SConstruct', """
+env = Environment()
+env.Tool('ninja')
+env.Program(target = 'foo', source = 'foo.c')
+env.Command('foo.out', ['foo'], './foo > foo.out')
+""")
+
+# generate simple build
+test.run(stdout=None)
+test.must_contain_all_lines(test.stdout(),
+    ['Generating: build.ninja', 'Executing: build.ninja'])
+test.must_match('foo.out', 'foo.c' + os.linesep)
+
+# clean build and ninja files
+test.run(arguments='-c', stdout=None)
+test.must_contain_all_lines(test.stdout(), [
+    'Removed foo.o',
+    'Removed foo',
+    'Removed foo.out',
+    'Removed build.ninja'])
+
+# only generate the ninja file
+test.run(arguments='--disable-auto-ninja', stdout=None)
+test.must_contain_all_lines(test.stdout(),
+    ['Generating: build.ninja'])
+test.must_not_contain_any_line(test.stdout(),
+    ['Executing: build.ninja'])
+
+# run ninja independently
+test.run(program = ninja, stdout=None)
+test.must_match('foo.out', 'foo.c' + os.linesep)
+
+
+
+test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4: