diff options
| author | William Deegan <bill@baddogconsulting.com> | 2017-08-01 20:34:13 (GMT) |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2017-08-01 20:34:13 (GMT) |
| commit | 5935bbcb4b449a686048d2c3f2723cbd6a05b2ab (patch) | |
| tree | 2839e3e380d105556855d975391b05d3cb16bdfc /src/engine | |
| parent | 0b639dc7557d416b1699e5043ec0998a8599bd49 (diff) | |
| parent | 9b2ccf37addb93b870abce4a2d36e3936167b514 (diff) | |
| download | SCons-5935bbcb4b449a686048d2c3f2723cbd6a05b2ab.zip SCons-5935bbcb4b449a686048d2c3f2723cbd6a05b2ab.tar.gz SCons-5935bbcb4b449a686048d2c3f2723cbd6a05b2ab.tar.bz2 | |
merge
Diffstat (limited to 'src/engine')
| -rw-r--r-- | src/engine/SCons/ActionTests.py | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/src/engine/SCons/ActionTests.py b/src/engine/SCons/ActionTests.py index a5432c6..cf42307 100644 --- a/src/engine/SCons/ActionTests.py +++ b/src/engine/SCons/ActionTests.py @@ -1428,17 +1428,6 @@ class CommandGeneratorActionTestCase(unittest.TestCase): def LocalFunc(): pass - if TestCmd.IS_PY3 and TestCmd.IS_WINDOWS: - func_matches = [ - b'0, 0, 0, 0,(),(),(d\x00S\x00),(),()', # PY 3.6 - b'0, 0, 0, 0,(),(),(d\x00\x00S),(),()', # PY 3.5 - ] - else: - func_matches = [ - b"0, 0, 0, 0,(),(),(d\000\000S),(),()", - b"0, 0, 0, 0,(),(),(d\x00\x00S),(),()", - ] - # Since the python bytecode has per version differences, we need different expected results per version func_matches = { (2,7) : bytearray(b'0, 0, 0, 0,(N.),(),(d\x00\x00S),(),()'), @@ -1446,10 +1435,6 @@ class CommandGeneratorActionTestCase(unittest.TestCase): (3,6) : bytearray(b'0, 0, 0, 0,(N.),(),(d\x00S\x00),(),()'), } - # c = SCons.Action._function_contents(func1) - # assert c == expected[sys.version_info[:2]], "Got\n"+repr(c)+"\nExpected \n"+"\n"+repr(expected[sys.version_info[:2]]) - - meth_matches = [ b"1, 1, 0, 0,(),(),(d\000\000S),(),()", b"1, 1, 0, 0,(),(),(d\x00\x00S),(),()", @@ -1838,17 +1823,6 @@ class LazyActionTestCase(unittest.TestCase): (3,6) : bytearray(b'0, 0, 0, 0,(N.),(),(d\x00S\x00),(),()'), } - # if TestCmd.IS_PY3 and TestCmd.IS_WINDOWS: - # func_matches = [ - # b'0, 0, 0, 0,(),(),(d\x00S\x00),(),()', - # b'0, 0, 0, 0,(),(),(d\x00\x00S),(),()' - # ] - # else: - # func_matches = [ - # b"0, 0, 0, 0,(),(),(d\000\000S),(),()", - # b"0, 0, 0, 0,(),(),(d\x00\x00S),(),()", - # ] - meth_matches = [ b"1, 1, 0, 0,(),(),(d\000\000S),(),()", b"1, 1, 0, 0,(),(),(d\x00\x00S),(),()", |