summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge pull request #3456 from edobez/masterWilliam Deegan2019-10-115-3/+153
|\ \ \ | | | | | | | | Debug option "timestamp"
| * | | Added debug option "timestamp", completely overhauled testEdoardo Bezzeccheri2019-10-111-196/+67
| | | | | | | | | | | | | | | | Started from scratch, removing copy of debug-time.py test.
| * | | Merge remote-tracking branch 'origin/master'Edoardo Bezzeccheri2019-10-099-22/+113
| |\ \ \ | |/ / / |/| | | | | | | | | | | # Conflicts: # src/CHANGES.txt
* | | | Merge pull request #3434 from mwichmann/CmdStringHolderWilliam Deegan2019-10-083-1/+57
|\ \ \ \ | | | | | | | | | | [WIP] CmdStringHolder should not fail in Subst
| * \ \ \ Merge branch 'master' into CmdStringHolderWilliam Deegan2019-10-0855-1144/+790
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #3457 from mwichmann/emitter-docWilliam Deegan2019-10-081-5/+25
|\ \ \ \ \ | |_|_|/ / |/| | | | Add doc for *EMITTER consvars
| * | | | Add doc for *EMITTER consvars [ci skip]Mats Wichmann2019-10-011-5/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Three *EMITTER construction variables had documentation of "TODO". A fourth, LDMODULEEMITTER, was not mentioned at all. Signed-off-by: Mats Wichmann <mats@linux.com>
* | | | | Merge pull request #3460 from jw0k/patch-1William Deegan2019-10-073-12/+24
|\ \ \ \ \ | | | | | | | | | | | | fix CheckFunc detection code for MSVC
| * \ \ \ \ Merge branch 'master' into patch-1William Deegan2019-10-063-3/+6
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge pull request #3453 from kulikjak/masterWilliam Deegan2019-10-062-2/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix subprocess result bytes not being decoded in SunOS/Solaris related tools.
| * | | | | | Modify CHANGES.txtJakub Kulík2019-09-271-0/+3
| | | | | | |
| * | | | | | Fix bytes not being decoded in suncxx.pyJakub Kulík2019-09-271-2/+2
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #3461 from mwichmann/mantypoWilliam Deegan2019-10-051-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | fix typo: missing quote in a manpage example
| * | | | | | fix typo: missing quote in a manpage example [ci skip]Mats Wichmann2019-10-051-1/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Mats Wichmann <mats@linux.com>
| | * | | | describe CheckFunc fixJacek Kuczera2019-10-061-0/+3
| | | | | |
| | * | | | test whether CheckFunc properly detects memmoveJacek Kuczera2019-10-061-11/+16
| | | | | |
| | * | | | fix CheckFunc detection code for MSVCjw0k2019-10-041-0/+4
| |/ / / / |/| | | |
* | | | | Merge pull request #3458 from NheelYolis/patch-1William Deegan2019-10-031-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | Fix a syntax error in the documentation
| * | | | Fix a syntax error in the documentationTheogen Ratkin2019-10-021-1/+1
|/ / / / | | | | | | | | Quotation marks do not match, which is a syntax error.
| * | | [PR #3434] apply subst fix from #3428Mats Wichmann2019-09-082-1/+2
| | | | | | | | | | | | | | | | Signed-off-by: Mats Wichmann <mats@linux.com>
| * | | CmdStringHolder should not fail in SubstMats Wichmann2019-09-071-0/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pass 1: test case showing the failure. This is WIP - need to add the fix, but want a CI build to show the fail. Closes issues #3248 Signed-off-by: Mats Wichmann <mats@linux.com>
| | * | Added debug option "timestamp", changed option "timestamp" to ↵Edoardo Bezzeccheri2019-10-095-15/+15
| | | | | | | | | | | | | | | | | | | | | | | | "action_timestamps" As per PR review
| | * | Added debug option "timestamp", rename test fileEdoardo Bezzeccheri2019-10-091-0/+0
| | | |
| | * | Added debug option "timestamp", fix shadowing internal fncEdoardo Bezzeccheri2019-10-091-2/+2
| | | |
| | * | Added debug option "timestamp", documentationEdoardo Bezzeccheri2019-10-011-1/+35
| | | |
| | * | Added debug option "timestamp", implementationEdoardo Bezzeccheri2019-10-012-2/+10
| | | |
| | * | Added debug option "timestamp", add testEdoardo Bezzeccheri2019-10-011-0/+234
| | | |
| | * | Added debug option "timestamp", modify CHANGES.txtEdoardo Bezzeccheri2019-10-011-0/+3
| |/ / |/| |
* | | Merge pull request #3419 from mwichmann/benchWilliam Deegan2019-09-266-315/+38
|\ \ \ | | | | | | | | Update bench and timings dirs for Py3
| * | | More bench tweaks [ci skip]Mats Wichmann2019-08-312-307/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - prefer time.perf_counter if available - catch case where time.clock unavail - lift comment from timeit on why different clock routins - get rid of timeit.py so use the stdlib version Signed-off-by: Mats Wichmann <mats@linux.com>
| * | | Update bench and timings dirs for Py3Mats Wichmann2019-08-315-8/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Minor changes for compatibility. Cannot currently run these tests effectively: 1. One of the bench runs doesn't work on Py3 yet. is_types.py fails with: ``` Traceback (most recent call last): File "bench.py", line 91, in <module> exec(open(args[0], 'r').read()) File "<string>", line 16, in <module> AttributeError: module 'types' has no attribute 'InstanceType' ``` The test fundamentally depends on checking if a type is an instance as part of what's being timed; the problem is types.InstanceType was only meaningful for old-style classes where all instances have the same type. Since that can't happen in Python 3 with new-style classes only, types.InstanceType has been removed entirely. Is it worth trying to figure out how to rejigger the test? 2. The calibrarions on the timings configs are horribly wrong for the local machine (10x too small), but not sure what to calibrate them for. 3. The calibration algorithm sometimes goes off base. The objective is to converge on something just under 10 seconds, and hit it three times in a row. In this snippet #25 got close, then we keep iterating and get further away in #27, #29, #31, #33 (this particular calibration eventually hit it's three with runs #55-57. ``` run 25: 9.207: TARGET_COUNT=1019 run 26: 11.026: TARGET_COUNT=1106 run 27: 8.630: TARGET_COUNT=1003 run 28: 12.046: TARGET_COUNT=1162 run 29: 8.240: TARGET_COUNT=964 run 30: 12.062: TARGET_COUNT=1169 run 31: 8.232: TARGET_COUNT=969 run 32: 12.470: TARGET_COUNT=1177 run 33: 8.185: TARGET_COUNT=943 ``` 4. Running any of the timings fails with stdout mismatch, as there is (unexpected?) timing output. Example CPPPATH - see the second line of the captured output for the extra data. Is this new data emitted by debug=time that the timings code is not expecting? ``` /home/mats/.pyenv/versions/python-3.7.3/bin/python /home/mats/github/scons/src/script/scons.py DIR_COUNT=813 --debug=memory,time . STDOUT ========================================================================= 1,6c1,14 < scons:\ Reading\ SConscript\ files\ \.\.\.\ < scons:\ done\ reading\ SConscript\ files\.\ < scons:\ Building\ targets\ \.\.\.\ < scons:\ `\.'\ is\ up\ to\ date\.\ < scons:\ done\ building\ targets\.\ < .* --- > scons: Reading SConscript files ... > SConscript:/tmp/testcmd.256448.xbxk_gj1/SConstruct took 107.051 ms > scons: done reading SConscript files. > scons: Building targets ... > scons: `.' is up to date. > scons: done building targets. > Memory before reading SConscript files: 139239424 > Memory after reading SConscript files: 145399808 > Memory before building targets: 145399808 > Memory after building targets: 148684800 > Total build time: 0.311640 seconds > Total SConscript file execution time: 0.107460 seconds > Total SCons execution time: 0.204180 seconds > Total command execution time: 0.000000 seconds FAILED test of /home/mats/github/scons/src/script/scons.py ... from line 53 of timings/CPPPATH/TimeSCons-run.py ``` 5. CPPPATH timing config runs into a command-line length problem if calibrating. Might be a testcase for using a file for long command lines even in the gcc case? ``` run 1: 0.490: DIR_COUNT=813 1/1 (100.00%) /home/mats/.pyenv/versions/python-3.7.3/bin/python timings/CPPPATH/TimeSCons-run.py /home/mats/github/scons/src/script/scons.py returned 2 STDOUT ========================================================================= scons: Reading SConscript files ... SConscript:/tmp/testcmd.253125.kkqcvz12/SConstruct took 1186.979 ms scons: done reading SConscript files. scons: Building targets ... gcc -o foo.o -c -Iinc_0000 -Iinc_0001 -Iinc_0002 ... incredibly long line chopped ... Iinc_16574 -Iinc_16575 -Iinc_16576 -Iinc_16577 -Iinc_16578 -Iinclude foo.c scons: building terminated because of errors. Memory before reading SConscript files: 139243520 Memory after reading SConscript files: 233705472 Memory before building targets: 233705472 Memory after building targets: 255672320 Total build time: 5.079720 seconds Total SConscript file execution time: 1.189501 seconds Total SCons execution time: 3.890219 seconds Total command execution time: 0.000000 seconds FAILED test of /home/mats/github/scons/src/script/scons.py ... from line 53 of timings/CPPPATH/TimeSCons-run.py STDERR ========================================================================= scons: *** [foo.o] sh: Argument list too long Traceback (most recent call last): File "bin/calibrate.py", line 88, in <module> sys.exit(main()) File "bin/calibrate.py", line 69, in main elapsed = float(em.group(1)) AttributeError: 'NoneType' object has no attribute 'group' ``` Signed-off-by: Mats Wichmann <mats@linux.com>
* | | | Merge pull request #3449 from mwichmann/install-tweakWilliam Deegan2019-09-264-4/+95
|\ \ \ \ | | | | | | | | | | Docs for InstallVersionedLib and --install-sandbox
| * | | | Docs for InstallVersionedLib and --install-sandbox [ci skip]Mats Wichmann2019-09-254-4/+95
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds --install-sandbox to manpage options and to section on Install builder. Adds mention of InstallVersionedLib to user guide. Fixes #3007 Signed-off-by: Mats Wichmann <mats@linux.com>
* | | | Merge pull request #3446 from mwichmann/appveyor-timesWilliam Deegan2019-09-241-1/+1
|\ \ \ \ | | | | | | | | | | Experiment: print test times for appveyor
| * | | | Experiment: print test times for appveyor [travis skip]Mats Wichmann2019-09-161-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Mats Wichmann <mats@linux.com>
* | | | | Merge pull request #3444 from mwichmann/depr-debugsWilliam Deegan2019-09-1715-506/+213
|\ \ \ \ \ | | | | | | | | | | | | Remove deprecated debug options
| * | | | | [PR #3444] fix test issues with --debug removalsMats Wichmann2019-09-128-69/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There were several uses of deprecated debug flags that had not been moved to to test/Deprecated, and so were missed when those moved to test/Removed. Also removed options from manpage. Signed-off-by: Mats Wichmann <mats@linux.com>
| * | | | | Remove deprecated debug optionsMats Wichmann2019-09-129-438/+201
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These options have been deprecated since 2007. They were originally announced to be disabled in SCons 2.0.0, but that didn't happen. Left the deprecated-debug-options behavior is in, but the dictionary of such options is now empty, and there's a new dict of removed options, and presence in that dict raises an exception. The four tests that were in test/Deprecated move to a new directory test/Removed and are simplified just to make sure invocation errors scons out. (git interprets most of these as remove/add for some reason) These appear to have been already removed from docs, so no doc impact. Signed-off-by: Mats Wichmann <mats@linux.com>
* | | | | Merge pull request #3445 from mwichmann/py38-stringwarnsWilliam Deegan2019-09-1624-90/+80
|\ \ \ \ \ | |/ / / / |/| | | | test: Fix SyntaxWarnings on escapes in Python strings
| * | | | test: Fix SyntaxWarnings on escapes in Python stringsMats Wichmann2019-09-1324-90/+80
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the remaining batch of SyntaxWarning cleanups in the test/ directory, as flagged by Python 3.8 (now tested with 3.8.0b4). Most of these are escapes in strings that are not recognized as Python-language escapes up front, due to the embedded nature of testing - tests write a string to a file which is actually Python (code or sconscript) which is later to be executed. Also changed the timestamp-fallback test to eliminate an imp module DeprecationWarning: since in all supported Python versions haslib is stdlib, drop that skip check; the md5 skip check can be a simple import now. My test runs with 3.8 show no SyntaxWarnings after this. Signed-off-by: Mats Wichmann <mats@linux.com>
* | | | Merge pull request #3437 from mwichmann/man-buildersWilliam Deegan2019-09-102-192/+271
|\ \ \ \ | | | | | | | | | | Builder and Variable Subst doc updates [ci skip]
| * | | | [PR #3437] review comment - add back curly bracesMats Wichmann2019-09-101-4/+7
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Mats Wichmann <mats@linux.com>
| * | | | Builder and Variable Subst doc updates [ci skip]Mats Wichmann2019-09-092-191/+267
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Work on Builder Methods and Variable Substitution man sections - some wording tweaks, do some formatting markup a little more consistently, etc. Tweak the wording for the Command builder, a description shared between manpage and userguide. Closes #3030: Environment.xml had many references to detail sections elsewhere, like "see XXX section below," which don't work well - this xml is generated into both the manpage and the user guide, and the locality of saying "below" is incorrect for the latter since those sections are only in the manpage. Essentially these are changed to say "see the manpage section XXX". Adding clickable links is of course also possible, but I recall there was some objection to cross-document links, so I didn't do that. Signed-off-by: Mats Wichmann <mats@linux.com>
* | | | Merge pull request #3440 from mwichmann/issue2444William Deegan2019-09-081-16/+37
|\ \ \ \ | |_|/ / |/| | | update env.Whereis docu [ci skip]
| * | | [fix #2444) update env.Whereis docu [ci skip]Mats Wichmann2019-09-081-16/+37
|/ / / | | | | | | | | | | | | | | | Apply the patch in the issue, and further tweak the wording. Signed-off-by: Mats Wichmann <mats@linux.com>
* | | Merge pull request #3425 from mwichmann/tool-docsWilliam Deegan2019-09-077-51/+239
|\ \ \ | | | | | | | | manpage: clarify that tools=[list] overrides [ci skip]
| * | | [#3425] review comment: pluralize source fileMats Wichmann2019-09-072-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Mats Wichmann <mats@linux.com>
| * | | [PR #3425] further tweak "default" tool wording [ci skip]Mats Wichmann2019-09-072-26/+26
| | | | | | | | | | | | | | | | Signed-off-by: Mats Wichmann <mats@linux.com>
| * | | [PR #3425] provide path to src for tool defaults [ci skip]Mats Wichmann2019-09-072-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | addresses review comment Signed-off-by: Mats Wichmann <mats@linux.com>
| * | | [PR #3245] fix sider complaint about misspelling [ci skip]Mats Wichmann2019-09-072-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Mats Wichmann <mats@linux.com>
generated by cgit v0.12 at 2025-04-06 17:58:46 (GMT)