Virtualization
/
meson
mirror of https://gitlab.com/qemu-project/meson.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #26 from Xenopathic/phony 

Always run tests and external commands
This commit is contained in:
jpakkane 2014-11-23 17:39:12 +02:00
parent caad76cf81 339d2a0a2b
commit 417f1d73a2
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ninjabackend.py
View File

@ -127,6 +127,7 @@ class NinjaBackend(backends.Backend):
outfile.write('# Do not edit by hand.\n\n') outfile.write('# Do not edit by hand.\n\n')
outfile.write('ninja_required_version = 1.3.4\n\n') outfile.write('ninja_required_version = 1.3.4\n\n')
self.generate_rules(outfile) self.generate_rules(outfile)
self.generate_phony(outfile)
outfile.write('# Build rules for targets\n\n') outfile.write('# Build rules for targets\n\n')
[self.generate_target(t, outfile) for t in self.build.get_targets().values()] [self.generate_target(t, outfile) for t in self.build.get_targets().values()]
if len(self.build.pot) > 0: if len(self.build.pot) > 0:
@ -480,13 +481,13 @@ class NinjaBackend(backends.Backend):
test_script = os.path.join(script_root, 'meson_test.py') test_script = os.path.join(script_root, 'meson_test.py')
test_data = os.path.join(self.environment.get_scratch_dir(), 'meson_test_setup.dat') test_data = os.path.join(self.environment.get_scratch_dir(), 'meson_test_setup.dat')
cmd = [sys.executable, test_script, test_data] cmd = [sys.executable, test_script, test_data]
elem = NinjaBuildElement('test', 'CUSTOM_COMMAND', 'all') elem = NinjaBuildElement('test', 'CUSTOM_COMMAND', ['all', 'PHONY'])
elem.add_item('COMMAND', cmd) elem.add_item('COMMAND', cmd)
elem.add_item('DESC', 'Running test suite.') elem.add_item('DESC', 'Running test suite.')
elem.write(outfile) elem.write(outfile)
if valgrind: if valgrind:
velem = NinjaBuildElement('test-valgrind', 'CUSTOM_COMMAND', 'all') velem = NinjaBuildElement('test-valgrind', 'CUSTOM_COMMAND', ['all', 'PHONY'])
velem.add_item('COMMAND', cmd + ['--wrapper=' + valgrind]) velem.add_item('COMMAND', cmd + ['--wrapper=' + valgrind])
velem.add_item('DESC', 'Running test suite under Valgrind.') velem.add_item('DESC', 'Running test suite under Valgrind.')
velem.write(outfile) velem.write(outfile)
@ -556,6 +557,11 @@ class NinjaBackend(backends.Backend):
outfile.write(desc) outfile.write(desc)
outfile.write('\n') outfile.write('\n')
def generate_phony(self, outfile):
outfile.write('# Phony build target, always out of date\n')
outfile.write('build PHONY: phony\n')
outfile.write('\n')
def generate_jar_target(self, target, outfile): def generate_jar_target(self, target, outfile):
fname = target.get_filename() fname = target.get_filename()
subdir = target.get_subdir() subdir = target.get_subdir()
@ -1317,14 +1323,14 @@ rule FORTRAN_DEP_HACK
elem.write(outfile) elem.write(outfile)
def generate_gcov_clean(self, outfile): def generate_gcov_clean(self, outfile):
gcno_elem = NinjaBuildElement('clean-gcno', 'CUSTOM_COMMAND', '') gcno_elem = NinjaBuildElement('clean-gcno', 'CUSTOM_COMMAND', 'PHONY')
script_root = self.environment.get_script_dir() script_root = self.environment.get_script_dir()
clean_script = os.path.join(script_root, 'delwithsuffix.py') clean_script = os.path.join(script_root, 'delwithsuffix.py')
gcno_elem.add_item('COMMAND', [sys.executable, clean_script, '.', 'gcno']) gcno_elem.add_item('COMMAND', [sys.executable, clean_script, '.', 'gcno'])
gcno_elem.add_item('description', 'Deleting gcno files') gcno_elem.add_item('description', 'Deleting gcno files')
gcno_elem.write(outfile) gcno_elem.write(outfile)
gcda_elem = NinjaBuildElement('clean-gcda', 'CUSTOM_COMMAND', '') gcda_elem = NinjaBuildElement('clean-gcda', 'CUSTOM_COMMAND', 'PHONY')
script_root = self.environment.get_script_dir() script_root = self.environment.get_script_dir()
clean_script = os.path.join(script_root, 'delwithsuffix.py') clean_script = os.path.join(script_root, 'delwithsuffix.py')
gcda_elem.add_item('COMMAND', [sys.executable, clean_script, '.', 'gcda']) gcda_elem.add_item('COMMAND', [sys.executable, clean_script, '.', 'gcda'])
@ -1387,7 +1393,7 @@ rule FORTRAN_DEP_HACK
ninja_command = environment.detect_ninja() ninja_command = environment.detect_ninja()
if ninja_command is None: if ninja_command is None:
raise RuntimeError('Could not detect ninja command') raise RuntimeError('Could not detect ninja command')
elem = NinjaBuildElement('clean', 'CUSTOM_COMMAND', '') elem = NinjaBuildElement('clean', 'CUSTOM_COMMAND', 'PHONY')
elem.add_item('COMMAND', [ninja_command, '-t', 'clean']) elem.add_item('COMMAND', [ninja_command, '-t', 'clean'])
elem.add_item('description', 'Cleaning') elem.add_item('description', 'Cleaning')
if self.environment.coredata.coverage: if self.environment.coredata.coverage: