From edf9643d4c0ced3884d47c04fe62f47ad8567bd0 Mon Sep 17 00:00:00 2001 From: William Deegan Date: Sat, 27 Mar 2021 21:22:43 -0700 Subject: Continue fixing sider complaints. --- test/ninja/build_libraries.py | 17 ++++++------ test/ninja/copy_function_command.py | 11 ++++---- test/ninja/generate_and_build.py | 2 +- test/ninja/generate_and_build_cxx.py | 3 ++- test/ninja/iterative_speedup.py | 30 +++++++++++++--------- test/ninja/multi_env.py | 15 ++++++----- .../sconstruct_generate_and_build | 5 ++++ .../sconstruct_generate_and_build.py | 6 ----- .../sconstruct_generate_and_build_cxx | 4 +++ .../sconstruct_generate_and_build_cxx.py | 6 ----- 10 files changed, 52 insertions(+), 47 deletions(-) create mode 100644 test/ninja/ninja_test_sconscripts/sconstruct_generate_and_build delete mode 100644 test/ninja/ninja_test_sconscripts/sconstruct_generate_and_build.py create mode 100644 test/ninja/ninja_test_sconscripts/sconstruct_generate_and_build_cxx delete mode 100644 test/ninja/ninja_test_sconscripts/sconstruct_generate_and_build_cxx.py diff --git a/test/ninja/build_libraries.py b/test/ninja/build_libraries.py index d1e7c13..198dcce 100644 --- a/test/ninja/build_libraries.py +++ b/test/ninja/build_libraries.py @@ -24,6 +24,7 @@ import os + import TestSCons from TestCmd import IS_WINDOWS, IS_MACOS @@ -34,14 +35,12 @@ try: except ImportError: test.skip_test("Could not find ninja module in python") - ninja_binary = test.where_is('ninja') if not ninja_binary: test.skip_test("Could not find ninja. Skipping test.") - _python_ = TestSCons._python_ -_exe = TestSCons._exe +_exe = TestSCons._exe ninja_bin = os.path.abspath(os.path.join( ninja.__file__, @@ -83,9 +82,9 @@ env.Program(target = 'test_static', source = static_obj, LIBS=[static_lib], LIBP 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()) -test.run(program = test.workpath('test'), stdout="library_function") -test.run(program = test.workpath('test_static'), stdout="library_function") +test.must_contain_all(test.stdout(), 'ninja%(_exe)s -f' % locals()) +test.run(program=test.workpath('test'), stdout="library_function") +test.run(program=test.workpath('test_static'), stdout="library_function") # clean build and ninja files test.run(arguments='-c', stdout=None) @@ -104,9 +103,9 @@ test.must_not_exist(test.workpath('test_static')) # 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('test'), stdout="library_function") -test.run(program = test.workpath('test_static'), stdout="library_function") +test.run(program=program, stdout=None) +test.run(program=test.workpath('test'), stdout="library_function") +test.run(program=test.workpath('test_static'), stdout="library_function") test.pass_test() diff --git a/test/ninja/copy_function_command.py b/test/ninja/copy_function_command.py index 08e8274..37af62f 100644 --- a/test/ninja/copy_function_command.py +++ b/test/ninja/copy_function_command.py @@ -23,6 +23,7 @@ # import os + import TestSCons from TestCmd import IS_WINDOWS @@ -34,7 +35,7 @@ except ImportError: test.skip_test("Could not find module in python") _python_ = TestSCons._python_ -_exe = TestSCons._exe +_exe = TestSCons._exe ninja_bin = os.path.abspath(os.path.join( ninja.__file__, @@ -56,8 +57,8 @@ env.Program(target = 'foo', source = 'foo2.c') 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()) -test.run(program = test.workpath('foo'), stdout="foo.c") +test.must_contain_all(test.stdout(), 'ninja%(_exe)s -f' % locals()) +test.run(program=test.workpath('foo'), stdout="foo.c") # clean build and ninja files test.run(arguments='-c', stdout=None) @@ -74,8 +75,8 @@ test.must_not_exist(test.workpath('foo')) # 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'), stdout="foo.c") +test.run(program=program, stdout=None) +test.run(program=test.workpath('foo'), stdout="foo.c") test.pass_test() diff --git a/test/ninja/generate_and_build.py b/test/ninja/generate_and_build.py index 6972a54..91be108 100644 --- a/test/ninja/generate_and_build.py +++ b/test/ninja/generate_and_build.py @@ -46,7 +46,7 @@ ninja_bin = os.path.abspath(os.path.join( test.dir_fixture('ninja-fixture') -test.file_fixture('ninja_test_sconscripts/sconstruct_generate_and_build.py', 'SConstruct') +test.file_fixture('ninja_test_sconscripts/sconstruct_generate_and_build', 'SConstruct') # generate simple build test.run(stdout=None) diff --git a/test/ninja/generate_and_build_cxx.py b/test/ninja/generate_and_build_cxx.py index ee6e0bd..481a7e5 100644 --- a/test/ninja/generate_and_build_cxx.py +++ b/test/ninja/generate_and_build_cxx.py @@ -23,6 +23,7 @@ # import os + import TestSCons from TestCmd import IS_WINDOWS @@ -50,7 +51,7 @@ test.dir_fixture('ninja-fixture') # env.Tool('ninja') # env.Program(target = 'test2', source = 'test2.cpp') # """) -test.file_fixture('ninja_test_sconscripts/sconstruct_generate_and_build_cxx.py','SConstruct') +test.file_fixture('ninja_test_sconscripts/sconstruct_generate_and_build_cxx', 'SConstruct') # generate simple build test.run() diff --git a/test/ninja/iterative_speedup.py b/test/ninja/iterative_speedup.py index 5fd4bc5..df010f4 100644 --- a/test/ninja/iterative_speedup.py +++ b/test/ninja/iterative_speedup.py @@ -23,8 +23,9 @@ # import os -import time import random +import time + import TestSCons from TestCmd import IS_WINDOWS @@ -36,7 +37,7 @@ except ImportError: test.skip_test("Could not find module in python") _python_ = TestSCons._python_ -_exe = TestSCons._exe +_exe = TestSCons._exe ninja_bin = os.path.abspath(os.path.join( ninja.__file__, @@ -68,6 +69,7 @@ int print_function0(); """) + def get_num_cpus(): """ Function to get the number of CPUs the system has. @@ -89,6 +91,7 @@ def get_num_cpus(): # Default return 1 + def generate_source(parent_source, current_source): test.write('source_{}.c'.format(current_source), """ #include @@ -111,8 +114,9 @@ def generate_source(parent_source, current_source): print_function%(current_source)s(); """ % locals()) + def mod_source_return(test_num): - parent_source = test_num-1 + parent_source = test_num - 1 test.write('source_{}.c'.format(test_num), """ #include #include @@ -128,8 +132,9 @@ def mod_source_return(test_num): } """ % locals()) + def mod_source_orig(test_num): - parent_source = test_num-1 + parent_source = test_num - 1 test.write('source_{}.c'.format(test_num), """ #include #include @@ -143,9 +148,10 @@ def mod_source_orig(test_num): } """ % locals()) + num_source = 200 -for i in range(1, num_source+1): - generate_source(i-1, i) +for i in range(1, num_source + 1): + generate_source(i - 1, i) test.write('main.c', """ #include @@ -183,15 +189,15 @@ ninja_program = [test.workpath('run_ninja_env.bat'), jobs] if IS_WINDOWS else [n start = time.perf_counter() test.run(arguments='--disable-execute-ninja', stdout=None) -test.run(program = ninja_program, stdout=None) +test.run(program=ninja_program, stdout=None) stop = time.perf_counter() ninja_times += [stop - start] -test.run(program = test.workpath('print_bin'), stdout="main print") +test.run(program=test.workpath('print_bin'), stdout="main print") for test_mod in tests_mods: mod_source_return(test_mod) start = time.perf_counter() - test.run(program = ninja_program, stdout=None) + test.run(program=ninja_program, stdout=None) stop = time.perf_counter() ninja_times += [stop - start] @@ -204,15 +210,15 @@ test.must_contain_all_lines(test.stdout(), [ 'Removed build.ninja']) start = time.perf_counter() -test.run(arguments = ["-f", "SConstruct_no_ninja", jobs], stdout=None) +test.run(arguments=["-f", "SConstruct_no_ninja", jobs], stdout=None) stop = time.perf_counter() scons_times += [stop - start] -test.run(program = test.workpath('print_bin'), stdout="main print") +test.run(program=test.workpath('print_bin'), stdout="main print") for test_mod in tests_mods: mod_source_return(test_mod) start = time.perf_counter() - test.run(arguments = ["-f", "SConstruct_no_ninja", jobs], stdout=None) + test.run(arguments=["-f", "SConstruct_no_ninja", jobs], stdout=None) stop = time.perf_counter() scons_times += [stop - start] diff --git a/test/ninja/multi_env.py b/test/ninja/multi_env.py index 53ec83b..d145888 100644 --- a/test/ninja/multi_env.py +++ b/test/ninja/multi_env.py @@ -23,6 +23,7 @@ # import os + import TestSCons from TestCmd import IS_WINDOWS @@ -34,7 +35,7 @@ except ImportError: test.skip_test("Could not find module in python") _python_ = TestSCons._python_ -_exe = TestSCons._exe +_exe = TestSCons._exe ninja_bin = os.path.abspath(os.path.join( ninja.__file__, @@ -60,9 +61,9 @@ env2.Program(target = 'bar', source = 'bar.c') 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()) -test.run(program = test.workpath('foo' + _exe), stdout="foo.c") -test.run(program = test.workpath('bar' + _exe), stdout="bar.c") +test.must_contain_all(test.stdout(), 'ninja%(_exe)s -f' % locals()) +test.run(program=test.workpath('foo' + _exe), stdout="foo.c") +test.run(program=test.workpath('bar' + _exe), stdout="bar.c") # clean build and ninja files test.run(arguments='-c', stdout=None) @@ -81,9 +82,9 @@ test.must_not_exist(test.workpath('bar' + _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.run(program = test.workpath('bar' + _exe), stdout="bar.c") +test.run(program=program, stdout=None) +test.run(program=test.workpath('foo' + _exe), stdout="foo.c") +test.run(program=test.workpath('bar' + _exe), stdout="bar.c") test.pass_test() diff --git a/test/ninja/ninja_test_sconscripts/sconstruct_generate_and_build b/test/ninja/ninja_test_sconscripts/sconstruct_generate_and_build new file mode 100644 index 0000000..242eb76 --- /dev/null +++ b/test/ninja/ninja_test_sconscripts/sconstruct_generate_and_build @@ -0,0 +1,5 @@ +DefaultEnvironment(tools=[]) + +env = Environment() +env.Tool('ninja') +env.Program(target='foo', source='foo.c') diff --git a/test/ninja/ninja_test_sconscripts/sconstruct_generate_and_build.py b/test/ninja/ninja_test_sconscripts/sconstruct_generate_and_build.py deleted file mode 100644 index 4123fd8..0000000 --- a/test/ninja/ninja_test_sconscripts/sconstruct_generate_and_build.py +++ /dev/null @@ -1,6 +0,0 @@ -# noqa: f821 -DefaultEnvironment(tools=[]) - -env = Environment() -env.Tool('ninja') -env.Program(target='foo', source='foo.c') diff --git a/test/ninja/ninja_test_sconscripts/sconstruct_generate_and_build_cxx b/test/ninja/ninja_test_sconscripts/sconstruct_generate_and_build_cxx new file mode 100644 index 0000000..51ca6c3 --- /dev/null +++ b/test/ninja/ninja_test_sconscripts/sconstruct_generate_and_build_cxx @@ -0,0 +1,4 @@ +DefaultEnvironment(tools=[]) +env = Environment() +env.Tool('ninja') +env.Program(target = 'test2', source = 'test2.cpp') diff --git a/test/ninja/ninja_test_sconscripts/sconstruct_generate_and_build_cxx.py b/test/ninja/ninja_test_sconscripts/sconstruct_generate_and_build_cxx.py deleted file mode 100644 index ab304fa..0000000 --- a/test/ninja/ninja_test_sconscripts/sconstruct_generate_and_build_cxx.py +++ /dev/null @@ -1,6 +0,0 @@ -# noqa: f821 - -DefaultEnvironment(tools=[]) -env = Environment() -env.Tool('ninja') -env.Program(target = 'test2', source = 'test2.cpp') -- cgit v0.12