diff options
| author | Joseph Brill <48932340+jcbrill@users.noreply.github.com> | 2023-12-12 15:35:03 (GMT) |
|---|---|---|
| committer | Joseph Brill <48932340+jcbrill@users.noreply.github.com> | 2023-12-12 15:35:03 (GMT) |
| commit | 5ffe87e43ebd3c607084c745de702ed7ede0b8be (patch) | |
| tree | 21a2fd6fb276e121b1fce86d471dc083a3b5ae5e | |
| parent | 72e3a7553372e03d823253e31fdaf2f5c9138f63 (diff) | |
| download | SCons-5ffe87e43ebd3c607084c745de702ed7ede0b8be.zip SCons-5ffe87e43ebd3c607084c745de702ed7ede0b8be.tar.gz SCons-5ffe87e43ebd3c607084c745de702ed7ede0b8be.tar.bz2 | |
Add additional CheckFunc test cases and update change notice for CheckFunc.
Changes:
* add additional CheckFunc test cases to SCons/SConfTests.py
* add paragraph tags around change notice for CheckFunc funcargs argument in doc/man/scons.xml
| -rw-r--r-- | SCons/SConfTests.py | 15 | ||||
| -rw-r--r-- | doc/man/scons.xml | 2 |
2 files changed, 16 insertions, 1 deletions
diff --git a/SCons/SConfTests.py b/SCons/SConfTests.py index 6e9aa62..08ef25e 100644 --- a/SCons/SConfTests.py +++ b/SCons/SConfTests.py @@ -671,12 +671,25 @@ int main(void) { log_file=self.test.workpath('config.log')) try: - # CheckFunc() + # look for function using default heading r = sconf.CheckFunc('strcpy') assert r, "did not find strcpy" + # no default heading, supply dummy signature r = sconf.CheckFunc('strcpy', '/* header */ char strcpy();') assert r, "did not find strcpy" + # ... supply complete signature, and function args r = sconf.CheckFunc('strcpy', header='/* header */ char *strcpy(char *dest, char *src);', funcargs='"", ""') + # ... supply standard header for prototype, and function args + assert r, "did not find strcpy" + r = sconf.CheckFunc('strcpy', header='#include <string.h>', funcargs='"", ""') + # also try in C++ mode + cpp_header = """\ +#ifdef __cplusplus +extern "C" +#endif +char *strcpy(char *dest, char *src); +""" + r = sconf.CheckFunc('strcpy', header=cpp_header, funcargs='"", ""', language="C++") assert r, "did not find strcpy" r = sconf.CheckFunc('hopefullynofunction') assert not r, "unexpectedly found hopefullynofunction" diff --git a/doc/man/scons.xml b/doc/man/scons.xml index e2e6a57..91e8dd7 100644 --- a/doc/man/scons.xml +++ b/doc/man/scons.xml @@ -3993,7 +3993,9 @@ Note: if <parameter>header</parameter> is supplied, by using the <parameter>funcargs</parameter>. </para> +<para> <emphasis>Changed in version 4.7.0: added the <parameter>funcargs</parameter>.</emphasis> +</para> <para>Returns a boolean indicating success or failure.</para> </listitem> |