diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2016-01-15 23:37:22 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2016-01-15 23:37:22 +0200 |
| commit | 66c01401deb186e6daa20cf4bf6a098076dda236 (patch) | |
| tree | 3ca6ab02d9d48612471af6f21eb51914908b9da7 /meson/ninjabackend.py | |
| parent | d2a14075b3bcee9235ba21e881f0910f8bf9167a (diff) | |
| download | meson-66c01401deb186e6daa20cf4bf6a098076dda236.zip meson-66c01401deb186e6daa20cf4bf6a098076dda236.tar.gz meson-66c01401deb186e6daa20cf4bf6a098076dda236.tar.bz2 | |
Moved scripts in the module and started work to run them via the main meson command.
Diffstat (limited to 'meson/ninjabackend.py')
| -rw-r--r-- | meson/ninjabackend.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/meson/ninjabackend.py b/meson/ninjabackend.py index d21cea0..80c94f9 100644 --- a/meson/ninjabackend.py +++ b/meson/ninjabackend.py @@ -1,4 +1,4 @@ -# Copyright 2012-2014 The Meson development team +# Copyright 2012-2016 The Meson development team # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -582,9 +582,8 @@ int dummy; self.serialise_tests() valgrind = environment.find_valgrind() script_root = self.environment.get_script_dir() - test_script = os.path.join(script_root, 'meson_test.py') test_data = os.path.join(self.environment.get_scratch_dir(), 'meson_test_setup.dat') - cmd = [sys.executable, test_script, test_data] + cmd = [sys.executable, self.environment.get_build_command(), '--internal', 'test', test_data] elem = NinjaBuildElement('test', 'CUSTOM_COMMAND', ['all', 'PHONY']) elem.add_item('COMMAND', cmd) elem.add_item('DESC', 'Running all tests.') @@ -604,7 +603,7 @@ int dummy; # And then benchmarks. benchmark_script = os.path.join(script_root, 'meson_benchmark.py') benchmark_data = os.path.join(self.environment.get_scratch_dir(), 'meson_benchmark_setup.dat') - cmd = [sys.executable, benchmark_script, benchmark_data] + cmd = [sys.executable, self.environment.get_build_command(), '--internal', 'benchmark', benchmark_data] elem = NinjaBuildElement('benchmark', 'CUSTOM_COMMAND', ['all', 'PHONY']) elem.add_item('COMMAND', cmd) elem.add_item('DESC', 'Running benchmark suite.') @@ -628,9 +627,11 @@ int dummy; outfile.write('rule REGENERATE_BUILD\n') c = (quote_char + ninja_quote(sys.executable) + quote_char, quote_char + ninja_quote(self.environment.get_build_command()) + quote_char, + '--internal', + 'regenerate', quote_char + ninja_quote(self.environment.get_source_dir()) + quote_char, quote_char + ninja_quote(self.environment.get_build_dir()) + quote_char) - outfile.write(" command = %s %s %s %s --backend ninja secret-handshake\n" % c) + outfile.write(" command = %s %s %s %s %s %s --backend ninja\n" % c) outfile.write(' description = Regenerating build files\n') outfile.write(' generator = 1\n\n') if len(self.build.pot) > 0: |