diff options
author | Steven Knight <knight@baldmt.com> | 2007-06-01 21:14:13 (GMT) |
---|---|---|
committer | Steven Knight <knight@baldmt.com> | 2007-06-01 21:14:13 (GMT) |
commit | f311f5ac8b8da71b93166bf566aa0a89c91abd50 (patch) | |
tree | 7e913c029bfbdf97ba614bb07f639af5d45ae2ae /test/Configure/config-h.py | |
parent | 3978c6205c89626792ff84de70e863967a912aba (diff) | |
download | SCons-f311f5ac8b8da71b93166bf566aa0a89c91abd50.zip SCons-f311f5ac8b8da71b93166bf566aa0a89c91abd50.tar.gz SCons-f311f5ac8b8da71b93166bf566aa0a89c91abd50.tar.bz2 |
Merged revisions 1907-1940,1942-1967 via svnmerge from
http://scons.tigris.org/svn/scons/branches/core
........
r1914 | stevenknight | 2007-05-19 20:18:45 -0700 (Sat, 19 May 2007) | 4 lines
Use the dict() builtin, not a by-hand function, to assemble --debug=explain
info. Update our backwards-compatibility dict() function so its calling
signature matches the later SCons dict() builtin, and so it actually works.
........
r1920 | stevenknight | 2007-05-21 19:59:00 -0700 (Mon, 21 May 2007) | 4 lines
Issue 1652: only add the {base}_p.c and {base}_data.c files if the
/proxy or /dlldata arguments are present (respectively).
(Allan Erskine)
........
r1921 | stevenknight | 2007-05-21 20:09:54 -0700 (Mon, 21 May 2007) | 2 lines
Add initial .svnt/conf file for experimental use.
........
r1924 | stevenknight | 2007-05-22 17:51:34 -0700 (Tue, 22 May 2007) | 3 lines
Don't let tool initialization overwrite ${C,CXX}FILESUFFIX if they're
already set.
........
r1925 | stevenknight | 2007-05-22 19:14:27 -0700 (Tue, 22 May 2007) | 3 lines
Change the --debug=explain message when AlwaysBuild() is set from
the default "unknown reasons" to "because AlwaysBuild() is specified."
........
r1927 | stevenknight | 2007-05-23 05:20:32 -0700 (Wed, 23 May 2007) | 3 lines
Issue 1658: Find Java anonymous classes when the next token after
the name is an open parenthesis. (Jan Nijtmans)
........
r1928 | stevenknight | 2007-05-23 11:50:20 -0700 (Wed, 23 May 2007) | 3 lines
Issue 1313: add support for {Get,Set}Option('help') and
{Get,Set}Option('random') .
........
r1929 | stevenknight | 2007-05-23 11:56:18 -0700 (Wed, 23 May 2007) | 3 lines
Issue 1362: Push/retrieve built symlinks to/from a CacheDir() as symlinks,
not by copying file contents.
........
r1930 | stevenknight | 2007-05-23 12:55:12 -0700 (Wed, 23 May 2007) | 3 lines
Issue 1638: add LaTeX scanner support for finding dependencies from
\usepackage{} directives. (Sohail Somani)
........
r1932 | stevenknight | 2007-05-24 05:06:45 -0700 (Thu, 24 May 2007) | 3 lines
Add a section mentioning that libraries can be built from mixed lists
of source code and object files. (Follow-up from IRC chat.)
........
r1933 | stevenknight | 2007-05-24 11:18:30 -0700 (Thu, 24 May 2007) | 2 lines
Issue 1467: add /opt/SUNWspro/bin to the default execution $PATH on Solaris.
........
r1934 | stevenknight | 2007-05-24 13:10:01 -0700 (Thu, 24 May 2007) | 3 lines
Support running tests when Python is in a path that contains
spaces (like "C:\Program Files\Python...").
........
r1935 | stevenknight | 2007-05-24 13:11:52 -0700 (Thu, 24 May 2007) | 4 lines
Issue 1479: print multiple projects in a Visual Studio 7.[01] solution
file, generating a separate GUID for each instead of re-using the
solution GUID. (Mark Bertoglio)
........
r1937 | stevenknight | 2007-05-26 14:35:17 -0700 (Sat, 26 May 2007) | 4 lines
Issue 1659: when stringifying a generator action, fall back to using
the default construction environment, not an empty dictionary, if not
environment was supplied.
........
r1938 | stevenknight | 2007-05-29 05:14:37 -0700 (Tue, 29 May 2007) | 2 lines
Re-run tests if any of the test infrastructure changed, too.
........
r1940 | stevenknight | 2007-05-29 06:58:42 -0700 (Tue, 29 May 2007) | 2 lines
Issue 1634: "define HAVE_FEATURE 1" lines in generated config.h files.
........
r1943 | stevenknight | 2007-05-29 13:24:34 -0700 (Tue, 29 May 2007) | 2 lines
Issue 1426: Generalize AlwaysBuild() to non-File Nodes.
........
r1945 | stevenknight | 2007-05-30 08:15:25 -0700 (Wed, 30 May 2007) | 3 lines
Clean up emitter unit tests: subdivide one large test case into
separate tests, code renaming and reorganizing for readability.
........
r1947 | stevenknight | 2007-05-30 10:22:49 -0700 (Wed, 30 May 2007) | 4 lines
Issue 1656: two PDB fixes:
1) support expansion of $TARGET, etc. in emitted file names
2) put the output PDB file in the target's build_dir
........
r1951 | stevenknight | 2007-05-31 12:51:42 -0700 (Thu, 31 May 2007) | 3 lines
Refactor the checkLogAndStdout() function into a TestSCons method
so we can split the sub-tests into their own scripts.
........
r1952 | stevenknight | 2007-05-31 13:00:56 -0700 (Thu, 31 May 2007) | 3 lines
Also move the definition of what system library we need to use for
Configure tests into the TestSCons class.
........
r1953 | stevenknight | 2007-05-31 14:12:16 -0700 (Thu, 31 May 2007) | 2 lines
Refactor the Configure context subtests into separate scripts.
........
r1954 | stevenknight | 2007-05-31 14:18:11 -0700 (Thu, 31 May 2007) | 3 lines
Get rid of the work_dir argument to checkLogAndStdout(), since we're
no longer executing sub-tests from separate subdirectories.
........
r1955 | stevenknight | 2007-05-31 14:35:20 -0700 (Thu, 31 May 2007) | 2 lines
Move the test to its correct subdirectory. Oops.
........
r1958 | stevenknight | 2007-06-01 08:35:50 -0700 (Fri, 01 Jun 2007) | 2 lines
Skip the Visual C/C++ PDB + BuildDir test when not run on Windows.
........
r1959 | stevenknight | 2007-06-01 09:35:09 -0700 (Fri, 01 Jun 2007) | 2 lines
Support an AddMethod() global function and construction environment method.
........
r1960 | stevenknight | 2007-06-01 09:52:59 -0700 (Fri, 01 Jun 2007) | 3 lines
Python 1.5 compatibility in the test infrastructure added to support
the refactored Configure tests.
........
r1963 | stevenknight | 2007-06-01 12:29:48 -0700 (Fri, 01 Jun 2007) | 2 lines
Python 1.5 compatibility fix for AddMethod().
........
Diffstat (limited to 'test/Configure/config-h.py')
-rw-r--r-- | test/Configure/config-h.py | 155 |
1 files changed, 155 insertions, 0 deletions
diff --git a/test/Configure/config-h.py b/test/Configure/config-h.py new file mode 100644 index 0000000..7bc8645 --- /dev/null +++ b/test/Configure/config-h.py @@ -0,0 +1,155 @@ +#!/usr/bin/env python +# +# __COPYRIGHT__ +# +# Permission is hereby granted, free of charge, to any person obtaining +# a copy of this software and associated documentation files (the +# "Software"), to deal in the Software without restriction, including +# without limitation the rights to use, copy, modify, merge, publish, +# distribute, sublicense, and/or sell copies of the Software, and to +# permit persons to whom the Software is furnished to do so, subject to +# the following conditions: +# +# The above copyright notice and this permission notice shall be included +# in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY +# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE +# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +# + +__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" + +""" +Verify creation of a config.h file from a Configure context. +""" + +import os +import re +import string + +import TestSCons + +test = TestSCons.TestSCons(match = TestSCons.match_exact) + +lib = test.Configure_lib +LIB = "LIB" + string.upper(lib) + +test.write('SConstruct', """\ +env = Environment() +import os +env.AppendENVPath('PATH', os.environ['PATH']) +conf = Configure(env, config_h = 'config.h') +r1 = conf.CheckFunc('printf') +r2 = conf.CheckFunc('noFunctionCall') +r3 = conf.CheckType('int') +r4 = conf.CheckType('noType') +r5 = conf.CheckCHeader('stdio.h', '<>') +r6 = conf.CheckCHeader('hopefullynoc-header.h') +r7 = conf.CheckCXXHeader('vector', '<>') +r8 = conf.CheckCXXHeader('hopefullynocxx-header.h') +env = conf.Finish() +conf = Configure(env, config_h = 'config.h') +r9 = conf.CheckLib('%(lib)s', 'sin') +r10 = conf.CheckLib('hopefullynolib', 'sin') +r11 = conf.CheckLibWithHeader('%(lib)s', 'math.h', 'c') +r12 = conf.CheckLibWithHeader('%(lib)s', 'hopefullynoheader2.h', 'c') +r13 = conf.CheckLibWithHeader('hopefullynolib2', 'math.h', 'c') +env = conf.Finish() +""" % locals()) + +expected_read_str = """\ +Checking for C function printf()... yes +Checking for C function noFunctionCall()... no +Checking for C type int... yes +Checking for C type noType... no +Checking for C header file stdio.h... yes +Checking for C header file hopefullynoc-header.h... no +Checking for C++ header file vector... yes +Checking for C++ header file hopefullynocxx-header.h... no +Checking for sin() in C library %(lib)s... yes +Checking for sin() in C library hopefullynolib... no +Checking for C library %(lib)s... yes +Checking for C library %(lib)s... no +Checking for C library hopefullynolib2... no +""" % locals() + +expected_build_str = """\ +scons: Configure: creating config.h +""" + +expected_stdout = test.wrap_stdout(build_str=expected_build_str, + read_str=expected_read_str) + +expected_config_h = string.replace("""\ +#ifndef CONFIG_H_SEEN +#define CONFIG_H_SEEN + +#define HAVE_PRINTF 1 +/* #undef HAVE_NOFUNCTIONCALL */ +#define HAVE_INT 1 +/* #undef HAVE_NOTYPE */ +#define HAVE_STDIO_H 1 +/* #undef HAVE_HOPEFULLYNOC_HEADER_H */ +#define HAVE_VECTOR 1 +/* #undef HAVE_HOPEFULLYNOCXX_HEADER_H */ +#define HAVE_%(LIB)s 1 +/* #undef HAVE_LIBHOPEFULLYNOLIB */ +#define HAVE_%(LIB)s 1 +/* #undef HAVE_%(LIB)s */ +/* #undef HAVE_LIBHOPEFULLYNOLIB2 */ + +#endif /* CONFIG_H_SEEN */ +""" % locals(), "\n", os.linesep) + +test.run(stdout=expected_stdout) + +config_h = test.read(test.workpath('config.h')) +if expected_config_h != config_h: + print "Unexpected config.h" + print "Expected: " + print "---------------------------------------------------------" + print repr(expected_config_h) + print "---------------------------------------------------------" + print "Found: " + print "---------------------------------------------------------" + print repr(config_h) + print "---------------------------------------------------------" + print "Stdio: " + print "---------------------------------------------------------" + print test.stdout() + print "---------------------------------------------------------" + test.fail_test() + +expected_read_str = re.sub(r'\b((yes)|(no))\b', + r'(cached) \1', + expected_read_str) +expected_build_str = "scons: `.' is up to date.\n" +expected_stdout = test.wrap_stdout(build_str=expected_build_str, + read_str=expected_read_str) +#expected_stdout = string.replace(expected_stdout, "\n", os.linesep) + +test.run(stdout=expected_stdout) + +config_h = test.read(test.workpath('config.h')) +if expected_config_h != config_h: + print "Unexpected config.h" + print "Expected: " + print "---------------------------------------------------------" + print repr(expected_config_h) + print "---------------------------------------------------------" + print "Found: " + print "---------------------------------------------------------" + print repr(config_h) + print "---------------------------------------------------------" + print "Stdio: " + print "---------------------------------------------------------" + print test.stdout() + print "---------------------------------------------------------" + test.fail_test() + +test.pass_test() |