From d31398c4a3e8b8f055821d3db6cf6d2ef1b09a40 Mon Sep 17 00:00:00 2001 From: Thomas Nagy Date: Sun, 21 Aug 2016 15:31:47 +0200 Subject: [PATCH] Docs on conf.multicheck --- waflib/Tools/c_config.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/waflib/Tools/c_config.py b/waflib/Tools/c_config.py index 5ea0d24a..c32dd9a0 100644 --- a/waflib/Tools/c_config.py +++ b/waflib/Tools/c_config.py @@ -1294,17 +1294,18 @@ def multicheck(self, *k, **kw): ctx.check_large_file(mandatory=False) conf.multicheck( - {'header_name':'stdio.h', 'msg':'... stdio', uselib_store='STDIO'}, + {'header_name':'stdio.h', 'msg':'... stdio', 'uselib_store':'STDIO', 'global_define':False}, {'header_name':'xyztabcd.h', 'msg':'... optional xyztabcd.h', 'mandatory': False}, {'header_name':'stdlib.h', 'msg':'... stdlib', 'okmsg': 'aye', 'errmsg': 'nope'}, {'func': test_build, 'msg':'... testing an arbitrary build function', 'okmsg':'ok'}, msg = 'Checking for headers in parallel', - mandatory = True # mandatory tests raise an error at the end - run_all_tests = True # try running all tests + mandatory = True, # mandatory tests raise an error at the end + run_all_tests = True, # try running all tests ) - The configuration tests may modify the values in conf.env in any order, so it is - strongly recommended to provide 'uselib_store' values to prevent race conditions + The configuration tests may modify the values in conf.env in any order, and the define + values can affect configuration tests being executed. It is hence recommended + to provide `uselib_store` values with `global_define=False` to prevent such issues. """ self.start_msg(kw.get('msg', 'Executing %d configuration tests' % len(k)), **kw)