Merge branch 'master' into jbrill-msvs-2022

5 files changed, 313 insertions, 0 deletions

diff --git a/test/ninja/force_scons_callback.py b/test/ninja/force_scons_callback.py
new file mode 100644
index 0000000..55c12ca
--- /dev/null
+++ b/test/ninja/force_scons_callback.py
@@ -0,0 +1,88 @@
+#!/usr/bin/env python
+#
+# Copyright The SCons Foundation
+#
+# 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.
+#
+
+import os
+
+import TestSCons
+from TestCmd import IS_WINDOWS
+
+test = TestSCons.TestSCons()
+
+try:
+    import ninja
+except ImportError:
+    test.skip_test("Could not find module in python")
+
+_python_ = TestSCons._python_
+_exe = TestSCons._exe
+
+ninja_bin = os.path.abspath(os.path.join(
+    ninja.__file__,
+    os.pardir,
+    'data',
+    'bin',
+    'ninja' + _exe))
+
+test.dir_fixture('ninja-fixture')
+
+test.file_fixture('ninja_test_sconscripts/sconstruct_force_scons_callback', 'SConstruct')
+
+# generate simple build
+test.run(stdout=None)
+test.must_contain_all_lines(test.stdout(), ['Generating: build.ninja'])
+test.must_contain_all(test.stdout(), 'Executing:')
+test.must_contain_all(test.stdout(), 'ninja%(_exe)s -f' % locals())
+if test.stdout().count('scons: Building targets') != 2:
+    test.fail_test()
+test.must_match('out.txt', 'foo.c' + os.linesep)
+test.must_match('out2.txt', "test2.cpp" + os.linesep)
+
+# clean build and ninja files
+test.run(arguments='-c', stdout=None)
+test.must_contain_all_lines(test.stdout(), [
+    'Removed out.txt',
+    'Removed out2.txt',
+    'Removed build.ninja'])
+
+# only generate the ninja file
+test.run(arguments='--disable-execute-ninja', stdout=None)
+test.must_contain_all_lines(test.stdout(), ['Generating: build.ninja'])
+test.must_not_exist(test.workpath('out.txt'))
+test.must_not_exist(test.workpath('out2.txt'))
+
+# run ninja independently
+program = test.workpath('run_ninja_env.bat') if IS_WINDOWS else ninja_bin
+test.run(program=program, stdout=None)
+if test.stdout().count('scons: Building targets') != 1:
+    test.fail_test()
+test.must_match('out.txt', 'foo.c' + os.linesep)
+test.must_match('out2.txt', "test2.cpp" + os.linesep)
+
+test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/ninja/mkdir_function_command.py b/test/ninja/mkdir_function_command.py
new file mode 100644
index 0000000..8a17623
--- /dev/null
+++ b/test/ninja/mkdir_function_command.py
@@ -0,0 +1,123 @@
+#!/usr/bin/env python
+#
+# Copyright The SCons Foundation
+#
+# 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.
+#
+
+import os
+
+import TestSCons
+from TestCmd import IS_WINDOWS
+
+test = TestSCons.TestSCons()
+
+try:
+    import ninja
+except ImportError:
+    test.skip_test("Could not find module in python")
+
+_python_ = TestSCons._python_
+_exe = TestSCons._exe
+
+ninja_bin = os.path.abspath(os.path.join(
+    ninja.__file__,
+    os.pardir,
+    'data',
+    'bin',
+    'ninja' + _exe))
+
+test.write('SConstruct', """
+SetOption('experimental','ninja')
+DefaultEnvironment(tools=[])
+env = Environment()
+env.Tool('ninja')
+env.Dir('test0')
+env.Dir('test1/test2')
+env.Dir('test3/test4')
+env.Command('test5', 'test3/test4', Mkdir('$TARGET'))
+env.Command('test6/test7', ['test1/test2', 'test0'], Mkdir('$TARGET'))
+""")
+
+# generate simple build
+test.run(stdout=None)
+test.must_contain_all_lines(test.stdout(), ['Generating: build.ninja'])
+test.must_contain_all(test.stdout(), 'Executing:')
+test.must_contain_single_instance_of(test.stdout(), ["scons: Building targets ..."])
+test.must_contain_all(test.stdout(), 'ninja%(_exe)s -f' % locals())
+test.must_exist([
+    test.workpath('test0'),
+    test.workpath('test1/test2'),
+    test.workpath('test3/test4'),
+    test.workpath('test5'),
+    test.workpath('test6/test7')
+])
+
+# clean build and ninja files
+test.run(arguments='-c', stdout=None)
+test.must_contain_all_lines(test.stdout(), [
+    'Removed build.ninja'])
+os.rmdir('test0')
+os.rmdir('test1/test2')
+os.rmdir('test1')
+os.rmdir('test3/test4')
+os.rmdir('test3')
+os.rmdir('test5')
+os.rmdir('test6/test7')
+os.rmdir('test6')
+
+test.must_not_exist([
+    test.workpath('test0'),
+    test.workpath('test1/test2'),
+    test.workpath('test3/test4'),
+    test.workpath('test5'),
+    test.workpath('test6/test7')
+])
+
+# only generate the ninja file
+test.run(arguments='--disable-execute-ninja', stdout=None)
+test.must_contain_all_lines(test.stdout(), ['Generating: build.ninja'])
+test.must_not_exist([
+    test.workpath('test0'),
+    test.workpath('test1/test2'),
+    test.workpath('test3/test4'),
+    test.workpath('test5'),
+    test.workpath('test6/test7')
+])
+
+# run ninja independently
+program = test.workpath('run_ninja_env.bat') if IS_WINDOWS else ninja_bin
+test.run(program=program, stdout=None)
+test.must_not_contain_any_line(test.stdout(), ["scons: Building targets ..."])
+test.must_exist([
+    test.workpath('test0'),
+    test.workpath('test1/test2'),
+    test.workpath('test3/test4'),
+    test.workpath('test5'),
+    test.workpath('test6/test7')
+])
+
+test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/ninja/ninja_command_line.py b/test/ninja/ninja_command_line.py
new file mode 100644
index 0000000..d8e3c08
--- /dev/null
+++ b/test/ninja/ninja_command_line.py
@@ -0,0 +1,82 @@
+#!/usr/bin/env python
+#
+# Copyright The SCons Foundation
+#
+# 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.
+#
+
+import os
+
+import TestSCons
+from TestCmd import IS_WINDOWS
+
+test = TestSCons.TestSCons()
+
+try:
+    import ninja
+except ImportError:
+    test.skip_test("Could not find module in python")
+
+_python_ = TestSCons._python_
+_exe = TestSCons._exe
+
+ninja_bin = os.path.abspath(os.path.join(
+    ninja.__file__,
+    os.pardir,
+    'data',
+    'bin',
+    'ninja' + _exe))
+
+test.dir_fixture('ninja-fixture', 'src')
+
+test.file_fixture('ninja_test_sconscripts/sconstruct_ninja_command_line', 'SConstruct')
+
+# generate simple build
+test.run(arguments=['BUILD=build', 'OTHER_VAR=$BUILD'], stdout=None)
+test.must_contain_all_lines(test.stdout(), ['Generating: build.ninja'])
+test.must_contain_all(test.stdout(), 'Executing:')
+test.must_contain_all(test.stdout(), 'ninja%(_exe)s -f' % locals())
+test.run(program=test.workpath('foo' + _exe), stdout="foo.c")
+
+# clean build and ninja files
+test.run(arguments=['-c', 'BUILD=build', 'OTHER_VAR=$BUILD'], stdout=None)
+test.must_contain_all_lines(test.stdout(), [
+    'Removed build%sbar2.c' % os.sep,
+    'Removed build%sbar2.o' % os.sep,
+    'Removed foo',
+    'Removed build.ninja'])
+
+# only generate the ninja file
+test.run(arguments=['--disable-execute-ninja', 'BUILD=build', 'OTHER_VAR=$BUILD'], stdout=None)
+test.must_contain_all_lines(test.stdout(), ['Generating: build.ninja'])
+test.must_not_exist(test.workpath('foo' + _exe))
+
+# run ninja independently
+program = test.workpath('run_ninja_env.bat') if IS_WINDOWS else ninja_bin
+test.run(program=program, stdout=None)
+test.run(program=test.workpath('foo' + _exe), stdout="foo.c")
+
+test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/ninja/ninja_test_sconscripts/sconstruct_force_scons_callback b/test/ninja/ninja_test_sconscripts/sconstruct_force_scons_callback
new file mode 100644
index 0000000..55729a6
--- /dev/null
+++ b/test/ninja/ninja_test_sconscripts/sconstruct_force_scons_callback
@@ -0,0 +1,8 @@
+SetOption('experimental','ninja')
+DefaultEnvironment(tools=[])
+
+env = Environment(tools=[])
+env.Tool('ninja')
+
+env.Command('out.txt', 'foo.c', 'echo $SOURCE> $TARGET', NINJA_FORCE_SCONS_BUILD=True)
+env.Command('out2.txt', 'test2.cpp', 'echo $SOURCE> $TARGET')
\ No newline at end of file
diff --git a/test/ninja/ninja_test_sconscripts/sconstruct_ninja_command_line b/test/ninja/ninja_test_sconscripts/sconstruct_ninja_command_line
new file mode 100644
index 0000000..14ae633
--- /dev/null
+++ b/test/ninja/ninja_test_sconscripts/sconstruct_ninja_command_line
@@ -0,0 +1,12 @@
+SetOption('experimental','ninja')
+DefaultEnvironment(tools=[])
+
+env_vars=Variables(args=ARGUMENTS)
+env_vars.Add('BUILD')
+env_vars.Add('OTHER_VAR')
+env = Environment(variables=env_vars)
+
+env.VariantDir(env['OTHER_VAR'], 'src')
+env.Tool('ninja')
+env.Textfile('$BUILD/bar2.c', open('src/foo.c').read())
+env.Program(target = 'foo', source = '$BUILD/bar2.c', CPPPATH='src')