summaryrefslogtreecommitdiffstats
path: root/test
Commit message (Collapse)AuthorAgeFilesLines
* Fix #2574: case sensitivity issue with Fortran module scanner.Gary Oberbrunner2010-06-171-0/+66
|
* Solaris portability fix to avoid substitutions during Tool module intialization.Steven Knight2010-06-161-1/+5
|
* Remove unnecessary left-over "import sys" statements.Steven Knight2010-06-1513-26/+0
|
* Issue 2647: In Executor.Null.get_all_children(), really return all ofSteven Knight2010-06-153-18/+84
| | | | the children, including the explicit dependencies, not just the sources.
* Merged revisions 4727-4729,4731-4938,4940-5028 via svnmerge fromSteven Knight2010-06-154-8/+99
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | http://scons.tigris.org/svn/scons/branches/pending ........ r4942 | stevenknight | 2010-06-03 12:41:20 -0700 (Thu, 03 Jun 2010) | 13 lines Isseu 2641: Latest drop of the TestCmd infrastructure, v. 1.3, including: * Support for test timeouts. * Ability to set separate match_stdout and match_stderr functions. * Ability to set separate diff_stdout and diff_stderr functions. * Static methods for the various underlying match* and diff* functionality. * Ability to get at the various match* and diff* functions by attribute name. * Got rid of checks for difflib now that Python 2.3 is the floor (for this infrastructure, anyway). Ripple effects in two test scripts. Added upstream unit test modules (QMTest/Test{Cmd,Common}Tests.py). Added a README.txt file. ........ r4943 | stevenknight | 2010-06-03 13:00:31 -0700 (Thu, 03 Jun 2010) | 2 lines Grab the correct TestCmd files with the updated version number. ........ r4946 | managan | 2010-06-04 09:39:20 -0700 (Fri, 04 Jun 2010) | 4 lines On Windows add a '/D' to the command line so it recognizes drive letters in the source or target file paths ........ r4947 | managan | 2010-06-04 09:51:48 -0700 (Fri, 04 Jun 2010) | 5 lines The scanner was not parsing the dependencies in \includegraphics commands when there was whitespace (including carriage returns) in the command. While we need a better long term fix this covers this concern. ........ r4948 | managan | 2010-06-04 11:13:12 -0700 (Fri, 04 Jun 2010) | 3 lines Dropped an import line that is needed by the last commit of mine for Windows depenedant option on latex command lines ........ r4949 | managan | 2010-06-04 12:27:48 -0700 (Fri, 04 Jun 2010) | 7 lines Some latex packages break up commands where you normally could not by using a comment character at the end of the first line. Our current scanner broke on this and lost some dependecies. While we need general fix, this patch solves this problem ........ r4950 | managan | 2010-06-04 15:51:36 -0700 (Fri, 04 Jun 2010) | 5 lines Tweak how we handle comments within Latex source files when scanning and looking for dependencies. We were adding a space when a comment broke a line and we should not have. ........ r4984 | managan | 2010-06-07 09:37:40 -0700 (Mon, 07 Jun 2010) | 6 lines The multi-line_include-options test failed to check for the existence of latex. Added that so this test is skipped on systems without latex. ........
* Move update-release-info.py from src/ to tests/update_release-info/Greg Noel2010-06-111-0/+256
|
* Windows portability.Steven Knight2010-06-101-1/+5
|
* More Solaris test fixes.Steven Knight2010-06-102-4/+2
|
* Increase the default timeout of TestSCons.wait_for() to 20.0 seconds.Steven Knight2010-06-105-9/+9
| | | | | | | | | | | | (--interactive mode on our Solaris buildbot slave takes longer than 10 seconds to create the necessary marker files.) Set the stdin attribute on our popen object to None after we close it, so some versions of subprocess.py don't try to write it after it's closed. If we time out waiting for a marker file to be created, then print any stdout or stderr that's already accumulated, since that may give clues about why the test failed.
* Move test/update-release-info.py to src/test_update-release-info.py.Steven Knight2010-06-101-244/+0
|
* More Solaris test fixes:Steven Knight2010-06-087-34/+64
| | | | | | | | | * Different messages and exit codes for errors. * Fix Solaris shared suffixes. * Add a function declaration to some in-line C code to avoid a warning from Sun's compiler. * Make test/Parallel/multiple-parents.py chatty to avoid hangs, and reduce how many times it calls SCons just to make it go a little quicker.
* Remove the rest of the logic for the noqmtest keywordGreg Noel2010-06-082-2/+2
|
* Test fixes for Solaris, notably making test/Actions/function.py printSteven Knight2010-06-085-29/+44
| | | | intermediate messages to avoid buildbot hangs.
* Fixed a bug in the regression test to use the right filenames for eachGreg Noel2010-06-071-10/+9
| | | | | | | | | | | platform; it was causing the test to fail on Windows. Added some documentation to bin/update-release-info.py. In my last log message, I forgot to mention that QMTest/TestRuntest.py was tweaked to make it less specialized for testing runtest.py. It can now be used to test other programs; in this case, bin/update-release-info.py. The defaults are unchanged so that it will normally test runtest.py.
* Windows portability: \ separators in the expected output.Steven Knight2010-06-071-6/+6
|
* Don't skip runtest.py tests on systems that don't have QMTest installed.Steven Knight2010-06-071-4/+5
|
* Initial drop of bin/update-release-info.py.Greg Noel2010-06-071-0/+245
| | | | | | | | | | | | This program automates the process of inserting the release configuration information that is currently done by hand. The configuration data now all lives in a file, 'ReleaseConfig'. Change the configuration file, run the program, and, hey presto, the files are updated. More work needs to be done; the documentation doesn't quite match with the program and the regression tests only cover the release flows, but it's important to get this stuff out before the next release is published so people can start using it.
* Explicitly initialize the construction environment with tools = ['mssdk',Steven Knight2010-06-061-1/+2
| | | | | 'msvc', 'mslink', 'midl'], so the test can actually find and compile against things like the atlbase.h file.
* Windows portability fixes in various tests. Fix runtest.py detectionSteven Knight2010-06-065-19/+31
| | | | of non-zero exit status on systems that don't have os.WEXITSTATUS().
* Fix a ripple effect from the change to TestSCons.re_escape().Steven Knight2010-06-051-5/+2
|
* Re-enable tests on non win32 platforms.William Deegan2010-06-0513-62/+38
| | | | This should alter the HOST_ARCH for these tests on non-x86 platforms to x86 and therefore run.
* Fix failing tests on macosxWilliam Deegan2010-06-0413-0/+78
|
* Prepare for checkpoint release. Everything should be set up and readyGreg Noel2010-05-303-3/+3
| | | | | | | | | | | | | | to go. Update various files to have the correct date, time, version, and floor. Rework Script/Main.py and QMTest/TestSCons.py to make automated updating possible in the future. Remove a duplicate MANIFEST-xml.in entry. Fix TeX tests, which ran 'kpsewitch' before determining if the TeX tools were installed.
* http://scons.tigris.org/issues/show_bug.cgi?id=2365Greg Noel2010-05-282-5/+4
| | | | | Thanks to Steven Knight, the SCCS and Perforce tests have been debugged. Only the BitKeeper test remains to be debugged.
* http://scons.tigris.org/issues/show_bug.cgi?id=2365Greg Noel2010-05-2829-257/+557
| | | | | | Start the deprecation cycle for SourceCode() and its related factory functions. Deprecation messages are added to the functions. Regression tests are modified to deal with the messages being generated. Documentation is updated.
* Update QMTEst/Test{Cmd,Common}.py to version 1.1 from upstream:Steven Knight2010-05-271-2/+2
| | | | | | | * incorporate and update the Python 3.0 fixer work by Greg: * full conversion to using subprocess for execution; * rename exactly_contain_all_lines() to must_contain_exactly_lines(); * other minor fixes and stylistic cleanups.
* Move tests for SourceCode() into test/Deprecated as a preliminary to beginningGreg Noel2010-05-2624-0/+0
| | | | the deprecation cycle.
* Start the deprecation cycle for the BuildDir() method and the build_dirGreg Noel2010-05-2621-79/+95
| | | | | | | | | | | | | | | | | | | | | | keyword parameter. Several existing tests were still using BuildDir() or build_dir; they were converted to use VariantDir() and variant_dir. New tests were added to validate that the --warn=deprecated-build-dir option and the SetOption method did the right thing. This led to the discovery that a commonly-used test pattern provided by the infrastructure gobbled up too much, causing tests to succeed when they should have failed. Fixing the pattern led to other tests needing to be fixed. In the process, it was discovered that the SCONSFLAG environment variable was not getting correctly reset to its original value. Fixing this also caused additional tests to misbehave, requiring them to be updated. And test/Sig.py, which tests the deprecated SCons.Sig module, was moved to the test/Deprecated directory. All in all, quite a lot of action for what was supposed to be a simple change.
* Update deprecated features to the next life-cycle stageGreg Noel2010-05-2111-84/+82
|
* Convert old-style classes in test scripts to new-style classes.Steven Knight2010-05-206-9/+10
|
* Convert old-style classes in Scanner/*.py modules to new-style classes.Steven Knight2010-05-161-16/+31
| | | | Ripple effect to fix monkey-patching in test/Scanner/generated.py.
* Merged revisions 4832,4834-4836 via svnmerge fromWilliam Deegan2010-05-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | http://scons.tigris.org/svn/scons/checkpoint/trunk ........ r4832 | bdbaddog | 2010-05-03 23:00:21 -0700 (Mon, 03 May 2010) | 3 lines Updated RELEASE.txt from Greg Noel ........ r4834 | bdbaddog | 2010-05-03 23:34:14 -0700 (Mon, 03 May 2010) | 3 lines Updates for 2.0.0.alpha.20100503 checkpoint release ........ r4835 | bdbaddog | 2010-05-08 14:27:43 -0700 (Sat, 08 May 2010) | 3 lines Change test to check for version 3.0 and expect failure, since we're now working on a 2.0 checkpoint. ........ r4836 | bdbaddog | 2010-05-08 14:31:58 -0700 (Sat, 08 May 2010) | 3 lines Update build date. Fix checkpoint build version string to remove the .dYYYYMMDD and change to .YYYYMMDD ........
* Add test routine to exactly match a set of lines no matter the orderGreg Noel2010-05-011-6/+4
|
* Fix test/option/profile.py to hide old-style import from fixers.Greg Noel2010-04-271-22/+6
|
* Python 2.6 forward compatibility with 3.x: use a subclass of io.StringIOSteven Knight2010-04-271-2/+15
| | | | to enforce that all strings passed to the .write() method are unicode.
* http://scons.tigris.org/issues/show_bug.cgi?id=2345Greg Noel2010-04-261-3/+16
| | | | Apply all the remaining changes from the fixers.
* Fix regression tests (imports not happening as expected)Greg Noel2010-04-252-4/+4
|
* Convert to Python 3.x division rules.Greg Noel2010-04-241-1/+1
|
* http://scons.tigris.org/issues/show_bug.cgi?id=2345Greg Noel2010-04-2429-167/+15
| | | | | | | Comb out all code that supported earlier versions of Python. Most such code is in snippets of only a few lines and can be identified by having a Python version string in it. Such snippets add up; this combing pass probably got rid of over 500 lines of code.
* http://scons.tigris.org/issues/show_bug.cgi?id=2317Greg Noel2010-04-234-5/+5
| | | | | | Apply the refactorings from the 'dict' fixer, less occurrences that were manually audited to be safe. Also pick up changes in bin/sfsum, a Python file that was not being scanned before.
* http://scons.tigris.org/issues/show_bug.cgi?id=2345Greg Noel2010-04-213-7/+8
| | | | | | Pass the python executable from the -P option to runtest to TestCmd.py. Create the escaped executable name in TestCmd.py as well. Pass those two values into derived test modules. Fix cascade problems in test scripts due to incorrect assumptions about the name of the executable.
* Rewrite uses of reduce(), which is being deprecated for Python 3.x.Steven Knight2010-04-201-1/+3
|
* Remove use of the "new" module from --debug=memoizer support.Steven Knight2010-04-191-44/+6
|
* Index: test/Variables/help.pyGreg Noel2010-04-196-47/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | =================================================================== --- test/Variables/help.py (revision 4792) +++ test/Variables/help.py (working copy) @@ -28,23 +28,15 @@ Test the Variables help messages. """ -import os.path +import os -try: - True, False -except NameError: - exec('True = (0 == 0)') - exec('False = (0 != 0)') +import TestSCons str_True = str(True) str_False = str(False) -import TestSCons - test = TestSCons.TestSCons() - - workpath = test.workpath() qtpath = os.path.join(workpath, 'qt') libpath = os.path.join(qtpath, 'lib') Index: test/Variables/PackageVariable.py =================================================================== --- test/Variables/PackageVariable.py (revision 4792) +++ test/Variables/PackageVariable.py (working copy) @@ -28,14 +28,8 @@ Test the PackageVariable canned Variable type. """ -import os.path +import os -try: - True, False -except NameError: - exec('True = (0 == 0)') - exec('False = (0 != 0)') - import TestSCons test = TestSCons.TestSCons() Index: test/Variables/BoolVariable.py =================================================================== --- test/Variables/BoolVariable.py (revision 4792) +++ test/Variables/BoolVariable.py (working copy) @@ -28,14 +28,8 @@ Test the BoolVariable canned Variable type. """ -import os.path +import os -try: - True, False -except NameError: - exec('True = (0 == 0)') - exec('False = (0 != 0)') - import TestSCons test = TestSCons.TestSCons() Index: test/Deprecated/Options/help.py =================================================================== --- test/Deprecated/Options/help.py (revision 4792) +++ test/Deprecated/Options/help.py (working copy) @@ -28,24 +28,16 @@ Test the Options help messages. """ -import os.path +import os import re -try: - True, False -except NameError: - exec('True = (0 == 0)') - exec('False = (0 != 0)') +import TestSCons str_True = str(True) str_False = str(False) -import TestSCons - test = TestSCons.TestSCons(match = TestSCons.match_re_dotall) - - workpath = test.workpath() qtpath = os.path.join(workpath, 'qt') libpath = os.path.join(qtpath, 'lib') Index: test/Deprecated/Options/PackageOption.py =================================================================== --- test/Deprecated/Options/PackageOption.py (revision 4792) +++ test/Deprecated/Options/PackageOption.py (working copy) @@ -28,14 +28,8 @@ Test the PackageOption canned Option type. """ -import os.path +import os -try: - True, False -except NameError: - exec('True = (0 == 0)') - exec('False = (0 != 0)') - import TestSCons test = TestSCons.TestSCons(match = TestSCons.match_re_dotall) Index: test/Deprecated/Options/BoolOption.py =================================================================== --- test/Deprecated/Options/BoolOption.py (revision 4792) +++ test/Deprecated/Options/BoolOption.py (working copy) @@ -28,12 +28,6 @@ Test the BoolOption canned Option type. """ -try: - True, False -except NameError: - exec('True = (0 == 0)') - exec('False = (0 != 0)') - import TestSCons test = TestSCons.TestSCons(match = TestSCons.match_re_dotall) Index: src/script/scons-time.py =================================================================== --- src/script/scons-time.py (revision 4792) +++ src/script/scons-time.py (working copy) @@ -45,13 +45,6 @@ import time try: - True, False -except NameError: - # Pre-2.2 Python has no True or False keyword. - exec('True = not 0') - exec('False = not 1') - -try: sorted except NameError: # Pre-2.4 Python has no sorted() function. Index: src/engine/SCons/compat/_scons_builtins.py =================================================================== --- src/engine/SCons/compat/_scons_builtins.py (revision 4792) +++ src/engine/SCons/compat/_scons_builtins.py (working copy) @@ -37,13 +37,8 @@ all() any() - bool() - dict() sorted() memoryview() - True - False - zip() Implementations of functions are *NOT* guaranteed to be fully compliant with these functions in later versions of Python. We are only concerned @@ -62,22 +57,6 @@ import builtins try: - False -except NameError: - # Pre-2.2 Python has no False keyword. - exec('builtins.False = not 1') - # Assign to False in this module namespace so it shows up in pydoc output. - #False = False - -try: - True -except NameError: - # Pre-2.2 Python has no True keyword. - exec('builtins.True = not 0') - # Assign to True in this module namespace so it shows up in pydoc output. - #True = True - -try: all except NameError: # Pre-2.5 Python has no all() function. @@ -108,42 +87,6 @@ any = any try: - bool -except NameError: - # Pre-2.2 Python has no bool() function. - def bool(value): - """Demote a value to 0 or 1, depending on its truth value. - - This is not to be confused with types.BooleanType, which is - way too hard to duplicate in early Python versions to be - worth the trouble. - """ - return not not value - builtins.bool = bool - bool = bool - -try: - dict -except NameError: - # Pre-2.2 Python has no dict() keyword. - def dict(seq=[], **kwargs): - """ - New dictionary initialization. - """ - d = {} - for k, v in seq: - d[k] = v - d.update(kwargs) - return d - builtins.dict = dict - -try: - file -except NameError: - # Pre-2.2 Python has no file() function. - builtins.file = open - -try: memoryview except NameError: # Pre-2.7 doesn't have the memoryview() built-in. @@ -185,27 +128,6 @@ return result builtins.sorted = sorted -# -try: - zip -except NameError: - # Pre-2.2 Python has no zip() function. - def zip(*lists): - """ - Emulates the behavior we need from the built-in zip() function - added in Python 2.2. - - Returns a list of tuples, where each tuple contains the i-th - element rom each of the argument sequences. The returned - list is truncated in length to the length of the shortest - argument sequence. - """ - result = [] - for i in range(min(list(map(len, lists)))): - result.append(tuple([l[i] for l in lists])) - return result - builtins.zip = zip - #if sys.version_info[:3] in ((2, 2, 0), (2, 2, 1)): # def lstrip(s, c=string.whitespace): # while s and s[0] in c: Index: runtest.py =================================================================== --- runtest.py (revision 4792) +++ runtest.py (working copy) @@ -97,17 +97,6 @@ import time try: - x = True -except NameError: - True = not 0 - False = not 1 -else: - del x - -if not hasattr(os, 'WEXITSTATUS'): - os.WEXITSTATUS = lambda x: x - -try: sorted except NameError: # Pre-2.4 Python has no sorted() function. Index: QMTest/TestSCons.py =================================================================== --- QMTest/TestSCons.py (revision 4792) +++ QMTest/TestSCons.py (working copy) @@ -23,12 +23,6 @@ import sys import time -try: - True -except NameError: - exec('True = not 0') - exec('False = not 1') - from TestCommon import * from TestCommon import __all__
* Replace remaining os.path.walk() calls with os.walk().Steven Knight2010-04-184-41/+15
|
* http://scons.tigris.org/issues/show_bug.cgi?id=2345Greg Noel2010-04-177-19/+12
| | | | | Fix the 'assignment to True or False' and the '__getitem__ not supported for exception classes' deprecation warnings.
* http://scons.tigris.org/issues/show_bug.cgi?id=2345Greg Noel2010-04-162-3/+2
| | | | | Quiet the rest of the 'callable' warnings and fix the rest of the 'cmp argument' warnings.
* http://scons.tigris.org/issues/show_bug.cgi?id=2345Greg Noel2010-04-152-3/+3
| | | | | | | | | Fixes due to running the regression tests with the '-3' option to Python2.6, which causes the run-time to look for potential compatibility problems with Python 3.x. In some cases, all we can do is quiet the warning since we still support Python versions that can't use the newer idiom. In other cases, we fix the problem. This patch contains a mix of quieting and fixing, plus a little lint.
* http://scons.tigris.org/issues/show_bug.cgi?id=2345Greg Noel2010-04-157-19/+19
| | | | | | Apply the first part of the 'raise' fixer (the three-argument cases are not converted and will need to wait until native support of with_traceback() is available).
* Eliminate / replace remaining cPickle references in test scripts.Steven Knight2010-04-142-4/+3
|