about summary refs log tree commit diff stats
path: root/test/os_dep
diff options
context:
space:
mode:
Diffstat (limited to 'test/os_dep')
-rwxr-xr-xtest/os_dep/common.py11
-rwxr-xr-xtest/os_dep/linux/stdlib.py16
-rw-r--r--test/os_dep/linux/test_env.py7
-rwxr-xr-xtest/os_dep/win_api_x86_32.py27
4 files changed, 32 insertions, 29 deletions
diff --git a/test/os_dep/common.py b/test/os_dep/common.py
index 5d525e32..749d71a7 100755
--- a/test/os_dep/common.py
+++ b/test/os_dep/common.py
@@ -1,12 +1,13 @@
 #! /usr/bin/env python2
 #-*- coding:utf-8 -*-
 
+from builtins import range
 import unittest
 import logging
-from miasm2.analysis.machine import Machine
-import miasm2.os_dep.common as commonapi
-from miasm2.core.utils import pck32
-from miasm2.jitter.csts import PAGE_READ, PAGE_WRITE
+from miasm.analysis.machine import Machine
+import miasm.os_dep.common as commonapi
+from miasm.core.utils import pck32
+from miasm.jitter.csts import PAGE_READ, PAGE_WRITE
 
 machine = Machine("x86_32")
 
@@ -25,7 +26,7 @@ class TestCommonAPI(unittest.TestCase):
         heap.alloc(jit, 60)
         ptr = heap.alloc(jit, 10)
         heap.alloc(jit, 80)
-        for i in xrange(10):
+        for i in range(10):
             self.assertEqual(heap.get_size(jit.vm, ptr+i), 10)
 
 if __name__ == '__main__':
diff --git a/test/os_dep/linux/stdlib.py b/test/os_dep/linux/stdlib.py
index ab39a487..a205002b 100755
--- a/test/os_dep/linux/stdlib.py
+++ b/test/os_dep/linux/stdlib.py
@@ -3,10 +3,10 @@
 
 import unittest
 import logging
-from miasm2.analysis.machine import Machine
-import miasm2.os_dep.linux_stdlib as stdlib
-from miasm2.core.utils import pck32
-from miasm2.jitter.csts import PAGE_READ, PAGE_WRITE
+from miasm.analysis.machine import Machine
+import miasm.os_dep.linux_stdlib as stdlib
+from miasm.core.utils import pck32
+from miasm.jitter.csts import PAGE_READ, PAGE_WRITE
 
 machine = Machine("x86_32")
 
@@ -19,12 +19,12 @@ class TestLinuxStdlib(unittest.TestCase):
 
     def test_xxx_sprintf(self):
         def alloc_str(s):
-            s += "\x00"
+            s += b"\x00"
             ptr = heap.alloc(jit, len(s))
             jit.vm.set_mem(ptr, s)
             return ptr
-        fmt  = alloc_str("'%s' %d")
-        str_ = alloc_str("coucou")
+        fmt  = alloc_str(b"'%s' %d")
+        str_ = alloc_str(b"coucou")
         buf = heap.alloc(jit,1024)
 
         jit.push_uint32_t(1111)
@@ -34,7 +34,7 @@ class TestLinuxStdlib(unittest.TestCase):
         jit.push_uint32_t(0) # ret_ad
         stdlib.xxx_sprintf(jit)
         ret = jit.get_str_ansi(buf)
-        self.assertEqual(ret, "'coucou' 1111")
+        self.assertEqual(ret, b"'coucou' 1111")
 
 
 if __name__ == '__main__':
diff --git a/test/os_dep/linux/test_env.py b/test/os_dep/linux/test_env.py
index 0c80571f..13351a84 100644
--- a/test/os_dep/linux/test_env.py
+++ b/test/os_dep/linux/test_env.py
@@ -1,12 +1,13 @@
+from __future__ import print_function
 import os
 import sys
 from pdb import pm
-from miasm2.analysis.binary import Container
-from miasm2.analysis.sandbox import Sandbox_Linux_x86_32, Sandbox_Linux_x86_64,\
+from miasm.analysis.binary import Container
+from miasm.analysis.sandbox import Sandbox_Linux_x86_32, Sandbox_Linux_x86_64,\
     Sandbox_Linux_arml, Sandbox_Linux_aarch64l
 
 if len(sys.argv) < 2:
-    print "Usage: %s <arch> ..." % sys.argv[0]
+    print("Usage: %s <arch> ..." % sys.argv[0])
     exit(0)
 
 arch = sys.argv[1]
diff --git a/test/os_dep/win_api_x86_32.py b/test/os_dep/win_api_x86_32.py
index f080ba89..a7d88f90 100755
--- a/test/os_dep/win_api_x86_32.py
+++ b/test/os_dep/win_api_x86_32.py
@@ -1,12 +1,13 @@
 #! /usr/bin/env python2
 #-*- coding:utf-8 -*-
 
+from builtins import range
 import unittest
 import logging
-from miasm2.analysis.machine import Machine
-import miasm2.os_dep.win_api_x86_32 as winapi
-from miasm2.core.utils import pck32
-from miasm2.jitter.csts import PAGE_READ, PAGE_WRITE
+from miasm.analysis.machine import Machine
+import miasm.os_dep.win_api_x86_32 as winapi
+from miasm.core.utils import pck32
+from miasm.jitter.csts import PAGE_READ, PAGE_WRITE
 
 machine = Machine("x86_32")
 
@@ -27,12 +28,12 @@ class TestWinAPI(unittest.TestCase):
 
     def test_msvcrt_sprintf(self):
         def alloc_str(s):
-            s += "\x00"
+            s += b"\x00"
             ptr = heap.alloc(jit, len(s))
             jit.vm.set_mem(ptr, s)
             return ptr
-        fmt  = alloc_str("'%s' %d")
-        str_ = alloc_str("coucou")
+        fmt  = alloc_str(b"'%s' %d")
+        str_ = alloc_str(b"coucou")
         buf = heap.alloc(jit,1024)
 
         jit.push_uint32_t(1111)
@@ -42,13 +43,13 @@ class TestWinAPI(unittest.TestCase):
         jit.push_uint32_t(0) # ret_ad
         winapi.msvcrt_sprintf(jit)
         ret = jit.get_str_ansi(buf)
-        self.assertEqual(ret, "'coucou' 1111")
+        self.assertEqual(ret, b"'coucou' 1111")
 
 
     def test_msvcrt_swprintf(self):
         def alloc_str(s):
             s = s.encode("utf-16le")
-            s += "\x00\x00"
+            s += b"\x00\x00"
             ptr = heap.alloc(jit, len(s))
             jit.vm.set_mem(ptr, s)
             return ptr
@@ -63,7 +64,7 @@ class TestWinAPI(unittest.TestCase):
         jit.push_uint32_t(0) # ret_ad
         winapi.msvcrt_swprintf(jit)
         ret = jit.get_str_unic(buf)
-        self.assertEqual(ret, "'coucou' 1111")
+        self.assertEqual(ret, u"'coucou' 1111")
 
 
     def test_msvcrt_realloc(self):
@@ -88,7 +89,7 @@ class TestWinAPI(unittest.TestCase):
         # Test with a buffer long enough
         addr = 0x80000
         size = len(winapi.winobjs.cur_dir)+1
-        jit.vm.add_memory_page(addr, PAGE_READ | PAGE_WRITE, "\x00" * (size), "")
+        jit.vm.add_memory_page(addr, PAGE_READ | PAGE_WRITE, b"\x00" * (size), "")
         jit.push_uint32_t(addr)   # buf
         jit.push_uint32_t(size)   # size
         jit.push_uint32_t(0)      # @return
@@ -98,7 +99,7 @@ class TestWinAPI(unittest.TestCase):
         self.assertEqual(len(dir_), size_ret)
 
         # Test with a buffer too small
-        jit.vm.set_mem(addr, "\xFF"*size)
+        jit.vm.set_mem(addr, b"\xFF"*size)
         jit.push_uint32_t(addr)   # buf
         jit.push_uint32_t(5)      # size
         jit.push_uint32_t(0)      # @return
@@ -215,7 +216,7 @@ class TestWinAPI(unittest.TestCase):
         self.assertTrue(vBool)
 
         # BOOL WINAPI Process32Next(_In_ HANDLE hSnapshot, _Out_ LPPROCESSENTRY32 lppe);
-        for i in xrange(3, -1, -1):
+        for i in range(3, -1, -1):
             jit.push_uint32_t(jit.stack_base)      # lppe
             jit.push_uint32_t(hSnap)               # hSnapshot
             jit.push_uint32_t(0)                   # @return