meson: add "check" argument to run_command
Meson is planning to change the default of the "check" argument to run_command (from false to true). Be explicit and include it in all invocations. Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
		
							parent
							
								
									ad5439bb53
								
							
						
					
					
						commit
						b20a7ee6f0
					
				@ -18,12 +18,12 @@ if sphinx_build.found()
 | 
				
			|||||||
  # This is a bit awkward but works: create a trivial document and
 | 
					  # This is a bit awkward but works: create a trivial document and
 | 
				
			||||||
  # try to run it with our configuration file (which enforces a
 | 
					  # try to run it with our configuration file (which enforces a
 | 
				
			||||||
  # version requirement). This will fail if sphinx-build is too old.
 | 
					  # version requirement). This will fail if sphinx-build is too old.
 | 
				
			||||||
  run_command('mkdir', ['-p', tmpdir / 'sphinx'])
 | 
					  run_command('mkdir', ['-p', tmpdir / 'sphinx'], check: true)
 | 
				
			||||||
  run_command('touch', [tmpdir / 'sphinx/index.rst'])
 | 
					  run_command('touch', [tmpdir / 'sphinx/index.rst'], check: true)
 | 
				
			||||||
  sphinx_build_test_out = run_command(SPHINX_ARGS + [
 | 
					  sphinx_build_test_out = run_command(SPHINX_ARGS + [
 | 
				
			||||||
    '-c', meson.current_source_dir(),
 | 
					    '-c', meson.current_source_dir(),
 | 
				
			||||||
    '-b', 'html', tmpdir / 'sphinx',
 | 
					    '-b', 'html', tmpdir / 'sphinx',
 | 
				
			||||||
    tmpdir / 'sphinx/out'])
 | 
					    tmpdir / 'sphinx/out'], check: false)
 | 
				
			||||||
  build_docs = (sphinx_build_test_out.returncode() == 0)
 | 
					  build_docs = (sphinx_build_test_out.returncode() == 0)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  if not build_docs
 | 
					  if not build_docs
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user