summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 4.3.0 updates4.3.0William Deegan2021-11-176-13/+15
|
* update debianWilliam Deegan2021-11-161-2/+9
|
* updated CHANGES.txt and RELEASE.txt for releaseWilliam Deegan2021-11-164-25/+14
|
* Updated docs for 4.2.0 releaseWilliam Deegan2021-11-1611-321/+378
|
* Merge pull request #4047 from jcassagnol-public/compile-with-fips-enabledWilliam Deegan2021-11-1638-214/+713
|\ | | | | Fix tests to work with FIPS enabled
| * Fixed two test bugs:Jacob Cassagnol2021-11-101-2/+4
| | | | | | | | | | the mocks have all attrs by default, had to remove the nonexistent ones. The test was missing the correct name and wasn't running.
| * Two more f-strings got away.Jacob Cassagnol2021-11-101-2/+2
| | | | | | | | These lines setup the sconsign program to use the correct filename for the test.
| * Slider caught some bugs introduced in prior commitJacob Cassagnol2021-11-101-5/+5
| | | | | | | | | | Accidentally added two unused format strings. Also referenced a variable from a copy-paste error.
| * Slider fixJacob Cassagnol2021-11-101-2/+2
| | | | | | | | | | is none vs == None. this check is to ensure that the default None passthrough works correctly
| * Normalized all sconsfiles and sub-sconsfiles to use algorithm if not ↵Jacob Cassagnol2021-11-1020-130/+182
| | | | | | | | | | | | | | | | | | defaulted to md5. Dir search now excludes all types of sconsfiles that are now created. Environment now defaults to the current scons filename instead of .sconsfile Sconsign now has a function used by a lot of code that gets the default sconsign filename Any tests referring to .sconsfile have now been changed, including one old legacy test.
| * Added testcases for new lines in Util.pyJacob Cassagnol2021-11-091-0/+11
| |
| * One f-string got away!Jacob Cassagnol2021-11-091-1/+1
| |
| * Fixing slider issues identified:Jacob Cassagnol2021-11-092-2/+1
| | | | | | | | | | | | | | | | | | | | The linter identified that warnings was unused in hash-format.py The linter found that the skip_test function call was using 2 space indentation (not sure how I managed to do that). Warning was originally added as hash-format gave a warning on ALLOWED_HASH_FORMATS != default That was changed to instead test the different cases directly. option--config.py skips the test if the default algorithm is not MD5 as the hashes used are OS-specific, and supporting it in FIPS mode would be difficult. It's better to just skip this testcase in FIPS mode instead as this specific test is different in that regard to the other FIPS-enabled tests.
| * Tests pass in python 3.6 and 3.9 in LinuxJacob Cassagnol2021-11-0915-101/+395
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modified failing tests to use the new defaulted .sconsign database based on the hash algorithm For MD5, default database will be .sconsign.dblite For other algorithms the default will be .sconsign_<hashname>.dblite. For all cases where the user changes the hash algorithm used, the database will be .sconsign_<hashname>.dblite (including md5) For sub-scons directories it remains as .sconsign Also added unit-tests for Util.py for the new hash default changes. It's difficult to setup a fips-compliant platform using containers, and instead we mock that. option--config uses multiple types of hash algorithms so was skipped. Removed one f-string (python 3.5 doesn't support those) Corrupt.py is using an explicit .sconsign so that was left as-is, and only the parent default .sconsign was changed for work test 1. A fetch-database name option was added to the testing framework. The unlink_sconsignfile was not updated as no usages of it were found.
| * Changed the fall-forward to an explicit version check instead.Jacob Cassagnol2021-11-041-15/+10
| | | | | | | | | | | | The original check was causing issues where 3.8 in Windows was throwing an unexpected error. This should hopefully fix 3.8 in Windows while maintaining the same support in Linux.
| * This should fix the Slider issues identified.Jacob Cassagnol2021-11-021-7/+7
| |
| * Passes tests in >= python 3.9Jacob Cassagnol2021-11-024-21/+80
| | | | | | | | | | | | | | | | | | | | | | Refactored code to match PR requirements Changed result ==... result== to result in(...) Updated the man page to reference the defaulting behavior for FIPS machines. Updated a typo and design of change in the CHANGES.txt file Made an ugly bit of code in Util.py that fixes it so python3.9 has MD5 support enabled in FIPS mode. The code is much more ugly than before, with the tradeoff being it's testable and usable. In python >= 3.9, SCons will now always default to MD5. Next commit will work on getting the tests to auto-skip the md5-required steps on versions <= python 3.8.
| * Half the failing testcases fixed.Jacob Cassagnol2021-11-017-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Still failing on: SCons/UtilTests.py test/Configure/ConfigureDryRunError.py test/Configure/implicit-cache.py test/Configure/option--config.py test/option/hash-format.py test/option/option-n.py test/question/Configure.py These tests all have hardcoded md5 sums or use md5 directly Next commit should fix it so the md5-specific tests are skipped if fips mode detected. Also will figure out a way around the hardcoded m5sums.
| * Code now works during FIPS mode.Jacob Cassagnol2021-11-014-9/+96
| | | | | | | | Test suite currently failing with FIPS enabled due to hard-coded MD5 tests.
* | Merge pull request #4052 from mwichmann/qtdocWilliam Deegan2021-11-1621-281/+384
|\ \ | | | | | | Deprecate qt tool and rearrange docs
| * | Undo runtest merge botch [ci skip]Mats Wichmann2021-11-111-4/+4
| | | | | | | | | | | | Signed-off-by: Mats Wichmann <mats@linux.com>
| * | Fix qt deprecation typo in CHANGES.txt [ci skip]Mats Wichmann2021-11-111-2/+3
| | | | | | | | | | | | Signed-off-by: Mats Wichmann <mats@linux.com>
| * | Update manpage to show qt warning is default-off [ci skip]Mats Wichmann2021-11-111-1/+5
| | | | | | | | | | | | Signed-off-by: Mats Wichmann <mats@linux.com>
| * | Downgrade qt tool warning to default-offMats Wichmann2021-11-112-5/+5
| | | | | | | | | | | | | | | | | | | | | Back out changes to runtest.py, those are now tracked in separate PR #4055 with some others. Signed-off-by: Mats Wichmann <mats@linux.com>
| * | Deprecate the qt tool.Mats Wichmann2021-11-1121-179/+225
| | | | | | | | | | | | | | | | | | | | | | | | Updates tests to disable the warning that this change enables. Fix runtest.py to make sure -o logging option captures all the output. Signed-off-by: Mats Wichmann <mats@linux.com>
| * | Fiddle Qt docsMats Wichmann2021-11-112-110/+162
|/ / | | | | | | | | | | | | | | | | | | | | | | Add markup. Move description of qt tool into entry for qt tool, itself, previously it was in the entry for the QTDIR variable. Add QTDIR environment variable to the manpage, since scons will read this one if set. Signed-off-by: Mats Wichmann <mats@linux.com>
* | Merge pull request #4049 from mwichmann/java-versionsWilliam Deegan2021-11-119-120/+278
|\ \ | | | | | | Update Java support for more versions
| * | [ci skip] minor edits on updates in CHANGES.txtWilliam Deegan2021-11-111-5/+5
| | |
| * | Oops, fix javah doc to suggest -h, not -d [ci skip]Mats Wichmann2021-11-061-1/+1
| | | | | | | | | | | | | | | | | | Listed the wrong option in the workaround suggestion. Signed-off-by: Mats Wichmann <mats@linux.com>
| * | Add userguide update on javah as wellMats Wichmann2021-11-053-13/+32
| | | | | | | | | | | | | | | | | | Also add more linux locations for Java headers (old saved patch) Signed-off-by: Mats Wichmann <mats@linux.com>
| * | Update Java support for more versionsMats Wichmann2021-11-048-107/+246
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * on Windows, detect more possible JDK locations. * On all platforms, more Java versions (up to 17.0 now). * Add some docu on version selection and on JavaH tool in light of javah command dropped since 10.0. * Try to be better about preserving user's passed-in JAVA* consvars. Signed-off-by: Mats Wichmann <mats@linux.com>
* | | Merge pull request #4033 from deriamis/regenerate-build.ninjaWilliam Deegan2021-11-118-64/+181
|\ \ \ | | | | | | | | Ensure build.ninja is always in a clean state
| * \ \ Merge branch 'master' into regenerate-build.ninjaWilliam Deegan2021-11-119-79/+96
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #4055 from mwichmann/runtest-stuffWilliam Deegan2021-11-111-9/+25
|\ \ \ \ | | | | | | | | | | Some adjustments to runtest.py
| * | | | Some adjustments to runtest.pyMats Wichmann2021-11-101-9/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Close a hole where if logging (-o) *and* multi-job (-j), the feedback from the tests was not logged. (-j) * Clear list of failed tests if no tests failed. * add a flush method to the Tee class, there are error conditions where the lack of a flush threw an exception. Signed-off-by: Mats Wichmann <mats@linux.com>
* | | | | Merge pull request #4057 from mwichmann/add-vs22-ciWilliam Deegan2021-11-111-14/+19
|\ \ \ \ \ | | | | | | | | | | | | Switch Windows CI builds to VS2022 and Py3.10
| * | | | | Fix appveyor test matrixMats Wichmann2021-11-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Mats Wichmann <mats@linux.com>
| * | | | | Switch Windows CI builds to VS2022 and Py3.10Mats Wichmann2021-11-101-12/+17
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Replacing the build with 3.5 and VS2015 Signed-off-by: Mats Wichmann <mats@linux.com>
* | | | | Merge pull request #4056 from mwichmann/scons-time-testWilliam Deegan2021-11-102-7/+14
|\ \ \ \ \ | |/ / / / |/| | | | Skip two scons-time tests on Windows
| * | | | Skip two scons-time tests on WindowsMats Wichmann2021-11-102-7/+14
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The scons-time tests trying to test the "run" subcommand of scons-time substitute a dummy script named my_python.py for Python. In order for this to work on Windows, the file association chain for .py files has to lead back to an Python interpreter, but we cannot control this - for example, systems with VS Code installed often steals this association in ways that are aren't easy to pre-detect. Note that scons-time itself carfully uses the Python interpreter to launch things so it's not affected by this, it's just the test that tries to mock part of this scheme that has problems. Signed-off-by: Mats Wichmann <mats@linux.com>
* | | | Merge pull request #4054 from mwichmann/testnitWilliam Deegan2021-11-102-3/+1
|\ \ \ \ | | | | | | | | | | Fix gcc-version test for Windows
| * | | | Fix gcc-version test for WindowsMats Wichmann2021-11-092-3/+1
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A constructed string containing the Python path wasn't listed as a raw string, which led to a unicode error, because the path string contained a \Users which was misinterpreted as a Unicode escape. Also had left a debug print in a script. Signed-off-by: Mats Wichmann <mats@linux.com>
* | | | [ci skip] fix sider complaintsWilliam Deegan2021-11-091-32/+32
| | | |
* | | | Merge pull request #4051 from bdbaddog/remove_msvc22_prereleaseWilliam Deegan2021-11-083-15/+6
|\ \ \ \ | |_|/ / |/| | | Remove -prerelease for MSVC 2022
| * | | Remove -prerelease for MSVC 2022William Deegan2021-11-053-15/+6
|/ / /
| * | run black on new test file to quiet sider complaintsWilliam Deegan2021-11-051-21/+21
| | |
| * | Restore appveyor.xml to normalWilliam Deegan2021-11-051-2/+1
| | |
| * | allow exit status of 1 or 2 on windows when running ninjaWilliam Deegan2021-11-051-1/+6
| | |
| * | temporarily just run the one test we're debugging in appveyorWilliam Deegan2021-11-041-1/+2
| | |
| * | Fix ninja_handle_control_c_rebuild for windows. The stderr on windows ↵William Deegan2021-11-041-2/+5
| | | | | | | | | | | | doesn't match other platforms, but it should be sufficient to verify that build.ninja file still exists