diff options
| author | serpilliere <serpilliere@users.noreply.github.com> | 2016-01-25 14:24:10 +0100 |
|---|---|---|
| committer | serpilliere <serpilliere@users.noreply.github.com> | 2016-01-25 14:24:10 +0100 |
| commit | b3fae7887d63bcdbb18b25ade6d20f152d802005 (patch) | |
| tree | 182b5e1cf950ae929ea7080bf1090adc9bfc4380 | |
| parent | aeeb1918b47ef9fc0be0b57bc916aa7f39f22387 (diff) | |
| parent | 195ae36b8fae391fbe9fcd3058a699f3f439983c (diff) | |
| download | miasm-b3fae7887d63bcdbb18b25ade6d20f152d802005.tar.gz miasm-b3fae7887d63bcdbb18b25ade6d20f152d802005.zip | |
Merge pull request #308 from commial/rename-test
Move types -> test_types to avoid namespace collision (creds @fmonjalet)
| -rw-r--r-- | example/jitter/example_types.py (renamed from example/jitter/types.py) | 0 | ||||
| -rw-r--r-- | test/core/test_types.py (renamed from test/core/types.py) | 0 | ||||
| -rw-r--r-- | test/test_all.py | 4 |
3 files changed, 2 insertions, 2 deletions
diff --git a/example/jitter/types.py b/example/jitter/example_types.py index c37c3b84..c37c3b84 100644 --- a/example/jitter/types.py +++ b/example/jitter/example_types.py diff --git a/test/core/types.py b/test/core/test_types.py index bb1d5da1..bb1d5da1 100644 --- a/test/core/types.py +++ b/test/core/test_types.py diff --git a/test/test_all.py b/test/test_all.py index 6a619948..6b94ad1f 100644 --- a/test/test_all.py +++ b/test/test_all.py @@ -191,7 +191,7 @@ for script in ["interval.py", "parse_asm.py", "utils.py", "sembuilder.py", - "types.py", + "test_types.py", ]: testset += RegressionTest([script], base_dir="core") ## Expression @@ -483,7 +483,7 @@ for script, dep in [(["x86_32.py", Example.get_sample("x86_32_sc.bin")], []), testset += ExampleJitter(script + ["--jitter", jitter], depends=dep, tags=tags) -testset += ExampleJitter(["types.py"]) +testset += ExampleJitter(["example_types.py"]) if __name__ == "__main__": |