MemStruct/Types: Renamed analysis.mem to core.types

2 files changed, 8 insertions, 7 deletions

diff --git a/test/analysis/mem.py b/test/core/types.py
index 6c7fc9e3..db72449c 100644
--- a/test/analysis/mem.py
+++ b/test/core/types.py
@@ -1,14 +1,14 @@
 #!/usr/bin/env python
 
-# miasm2.analysis.mem tests
+# miasm2.core.types tests
 
 import struct
 
 from miasm2.analysis.machine import Machine
-from miasm2.analysis.mem import MemStruct, Num, Ptr, Str, \
-                                Array, RawStruct, Union, \
-                                BitField, Self, Void, Bits, \
-                                set_allocator, MemUnion, Struct
+from miasm2.core.types import MemStruct, Num, Ptr, Str, \
+                              Array, RawStruct, Union, \
+                              BitField, Self, Void, Bits, \
+                              set_allocator, MemUnion, Struct
 from miasm2.jitter.csts import PAGE_READ, PAGE_WRITE
 from miasm2.os_dep.common import heap
 
diff --git a/test/test_all.py b/test/test_all.py
index 71f036a2..6a619948 100644
--- a/test/test_all.py
+++ b/test/test_all.py
@@ -191,6 +191,7 @@ for script in ["interval.py",
                "parse_asm.py",
                "utils.py",
                "sembuilder.py",
+               "types.py",
                ]:
     testset += RegressionTest([script], base_dir="core")
 ## Expression
@@ -238,8 +239,6 @@ testset += RegressionTest(["depgraph.py"], base_dir="analysis",
                                                         (14, 1), (15, 1)))
                            for fname in fnames])
 
-testset += RegressionTest(["mem.py"], base_dir="analysis")
-
 # Examples
 class Example(Test):
     """Examples specificities:
@@ -484,6 +483,8 @@ 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"])
+
 
 if __name__ == "__main__":
     # Argument parsing