diff options
| author | William Deegan <bill@baddogconsulting.com> | 2017-05-31 15:13:33 (GMT) |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2017-05-31 15:13:33 (GMT) |
| commit | fa010fc259843fcefb12633fc0930d74ab090166 (patch) | |
| tree | 1273ced4825fa6f814a2f012992d69b11988a097 /src/engine | |
| parent | a420014e771d33e2514c0b4f3fc98d3085026a08 (diff) | |
| parent | 80ab6440d1010d56e922fc99230b5a8426363885 (diff) | |
| download | SCons-fa010fc259843fcefb12633fc0930d74ab090166.zip SCons-fa010fc259843fcefb12633fc0930d74ab090166.tar.gz SCons-fa010fc259843fcefb12633fc0930d74ab090166.tar.bz2 | |
merge
Diffstat (limited to 'src/engine')
| -rw-r--r-- | src/engine/.aeignore | 5 | ||||
| -rw-r--r-- | src/engine/SCons/.aeignore | 5 | ||||
| -rw-r--r-- | src/engine/SCons/ActionTests.py | 4 | ||||
| -rw-r--r-- | src/engine/SCons/Node/.aeignore | 5 | ||||
| -rw-r--r-- | src/engine/SCons/Platform/.aeignore | 5 | ||||
| -rw-r--r-- | src/engine/SCons/Scanner/.aeignore | 5 | ||||
| -rw-r--r-- | src/engine/SCons/Script/.aeignore | 5 | ||||
| -rw-r--r-- | src/engine/SCons/Tool/.aeignore | 5 |
8 files changed, 2 insertions, 37 deletions
diff --git a/src/engine/.aeignore b/src/engine/.aeignore deleted file mode 100644 index 22ebd62..0000000 --- a/src/engine/.aeignore +++ /dev/null @@ -1,5 +0,0 @@ -*,D -*.pyc -.*.swp -.consign -.sconsign diff --git a/src/engine/SCons/.aeignore b/src/engine/SCons/.aeignore deleted file mode 100644 index 22ebd62..0000000 --- a/src/engine/SCons/.aeignore +++ /dev/null @@ -1,5 +0,0 @@ -*,D -*.pyc -.*.swp -.consign -.sconsign diff --git a/src/engine/SCons/ActionTests.py b/src/engine/SCons/ActionTests.py index 7f7fe05..82c5e0e 100644 --- a/src/engine/SCons/ActionTests.py +++ b/src/engine/SCons/ActionTests.py @@ -2048,7 +2048,7 @@ class ObjectContentsTestCase(unittest.TestCase): assert expected == c, "Got\n"+repr(c)+"\nExpected \n"+repr(expected)+"\n" - @unittest.skip("Results vary between py2 and py3, not sure if test makes sense to implement") + # @unittest.skip("Results vary between py2 and py3, not sure if test makes sense to implement") def test_object_contents(self): """Test that Action._object_contents works""" @@ -2058,7 +2058,7 @@ class ObjectContentsTestCase(unittest.TestCase): expected = bytearray("(i__main__\nTestClass\np1\n(dp2\nS'a'\nS'a'\nsS'b'\nS'b'\nsb.", 'utf-8') assert expected == c, "Got\n" + repr(c) + "\nExpected\n" + repr(expected) - @unittest.skip("Results vary between py2 and py3, not sure if test makes sense to implement") + # @unittest.skip("Results vary between py2 and py3, not sure if test makes sense to implement") def test_code_contents(self): """Test that Action._code_contents works""" diff --git a/src/engine/SCons/Node/.aeignore b/src/engine/SCons/Node/.aeignore deleted file mode 100644 index 22ebd62..0000000 --- a/src/engine/SCons/Node/.aeignore +++ /dev/null @@ -1,5 +0,0 @@ -*,D -*.pyc -.*.swp -.consign -.sconsign diff --git a/src/engine/SCons/Platform/.aeignore b/src/engine/SCons/Platform/.aeignore deleted file mode 100644 index 22ebd62..0000000 --- a/src/engine/SCons/Platform/.aeignore +++ /dev/null @@ -1,5 +0,0 @@ -*,D -*.pyc -.*.swp -.consign -.sconsign diff --git a/src/engine/SCons/Scanner/.aeignore b/src/engine/SCons/Scanner/.aeignore deleted file mode 100644 index 22ebd62..0000000 --- a/src/engine/SCons/Scanner/.aeignore +++ /dev/null @@ -1,5 +0,0 @@ -*,D -*.pyc -.*.swp -.consign -.sconsign diff --git a/src/engine/SCons/Script/.aeignore b/src/engine/SCons/Script/.aeignore deleted file mode 100644 index 22ebd62..0000000 --- a/src/engine/SCons/Script/.aeignore +++ /dev/null @@ -1,5 +0,0 @@ -*,D -*.pyc -.*.swp -.consign -.sconsign diff --git a/src/engine/SCons/Tool/.aeignore b/src/engine/SCons/Tool/.aeignore deleted file mode 100644 index 22ebd62..0000000 --- a/src/engine/SCons/Tool/.aeignore +++ /dev/null @@ -1,5 +0,0 @@ -*,D -*.pyc -.*.swp -.consign -.sconsign |