about summary refs log tree commit diff stats
path: root/test
diff options
context:
space:
mode:
authorserpilliere <serpilliere@users.noreply.github.com>2021-05-06 23:23:06 +0200
committerGitHub <noreply@github.com>2021-05-06 23:23:06 +0200
commit6285271a95f3ec9815728fb808a69bb21b50f770 (patch)
tree486f3b67c279b452085943864dea336c760106aa /test
parentacfb6e552b287cc91d2060456be4ea7071b9ba8e (diff)
parente0abd462cefd168ae82426533c1a822254aca374 (diff)
downloadmiasm-6285271a95f3ec9815728fb808a69bb21b50f770.tar.gz
miasm-6285271a95f3ec9815728fb808a69bb21b50f770.zip
Merge pull request #1368 from Summus-git/replace_run_bool
Replace jitter.run boolean by jitter.running
Diffstat (limited to 'test')
-rw-r--r--test/arch/x86/qemu/testqemu.py2
-rw-r--r--test/arch/x86/qemu/testqemu64.py2
-rw-r--r--test/jitter/bad_block.py2
-rw-r--r--test/jitter/jit_options.py8
-rw-r--r--test/jitter/jitload.py4
-rw-r--r--test/jitter/jmp_out_mem.py2
-rw-r--r--test/os_dep/linux/test_env.py2
7 files changed, 11 insertions, 11 deletions
diff --git a/test/arch/x86/qemu/testqemu.py b/test/arch/x86/qemu/testqemu.py
index 6a516ac3..4de3ccf5 100644
--- a/test/arch/x86/qemu/testqemu.py
+++ b/test/arch/x86/qemu/testqemu.py
@@ -141,4 +141,4 @@ sb.jitter.vm.add_memory_page(0x7fff0000 + 0x14, PAGE_READ | PAGE_WRITE, b"AAAA")
 # Run
 sb.run(addr)
 
-assert(sb.jitter.run is False)
+assert(sb.jitter.running is False)
diff --git a/test/arch/x86/qemu/testqemu64.py b/test/arch/x86/qemu/testqemu64.py
index b17abe66..bb2f853a 100644
--- a/test/arch/x86/qemu/testqemu64.py
+++ b/test/arch/x86/qemu/testqemu64.py
@@ -137,4 +137,4 @@ sb.jitter.vm.add_memory_page(0x7fff0000 + 0x28, PAGE_READ | PAGE_WRITE, b"AAAAAA
 # Run
 sb.run(addr)
 
-assert(sb.jitter.run is False)
+assert(sb.jitter.running is False)
diff --git a/test/jitter/bad_block.py b/test/jitter/bad_block.py
index e7484c9e..a1743847 100644
--- a/test/jitter/bad_block.py
+++ b/test/jitter/bad_block.py
@@ -5,7 +5,7 @@ from miasm.analysis.machine import Machine
 from miasm.core.locationdb import LocationDB
 
 def code_sentinelle(jitter):
-    jitter.run = False
+    jitter.running = False
     jitter.pc = 0
     return True
 
diff --git a/test/jitter/jit_options.py b/test/jitter/jit_options.py
index f1258323..3b61cff8 100644
--- a/test/jitter/jit_options.py
+++ b/test/jitter/jit_options.py
@@ -25,7 +25,7 @@ run_addr = 0x40000000
 loc_db = LocationDB()
 
 def code_sentinelle(jitter):
-    jitter.run = False
+    jitter.running = False
     jitter.pc = 0
     return True
 
@@ -50,7 +50,7 @@ myjit = init_jitter(loc_db)
 myjit.init_run(run_addr)
 myjit.continue_run()
 
-assert myjit.run is False
+assert myjit.running is False
 assert myjit.cpu.EAX  == 0x0
 
 ## Let's specify a max_exec_per_call
@@ -74,7 +74,7 @@ myjit.init_run(run_addr)
 myjit.exec_cb = cb
 myjit.continue_run()
 
-assert myjit.run is True
+assert myjit.running is True
 # Use a '>=' because it's a 'max_...'
 assert myjit.cpu.EAX >= 0xA
 
@@ -94,7 +94,7 @@ myjit.init_run(run_addr)
 myjit.exec_cb = cb
 myjit.continue_run()
 
-assert myjit.run is False
+assert myjit.running is False
 assert myjit.cpu.EAX  == 0x00
 ## main(2) + (loop_main(3))*(0x10) + loop_end(1) + 0x1337beef (1)
 assert counter == 52
diff --git a/test/jitter/jitload.py b/test/jitter/jitload.py
index 7a72d1d5..d93414b9 100644
--- a/test/jitter/jitload.py
+++ b/test/jitter/jitload.py
@@ -21,7 +21,7 @@ myjit.vm.add_memory_page(run_addr, PAGE_READ | PAGE_WRITE, data)
 
 # Sentinelle called on terminate
 def code_sentinelle(jitter):
-    jitter.run = False
+    jitter.running = False
     jitter.pc = 0
     return True
 
@@ -33,7 +33,7 @@ myjit.init_run(run_addr)
 myjit.continue_run()
 
 # Check end
-assert myjit.run is False
+assert myjit.running is False
 
 # Check resulting state / accessors
 assert myjit.cpu.EAX == 0
diff --git a/test/jitter/jmp_out_mem.py b/test/jitter/jmp_out_mem.py
index 3d01aacc..b4d4600b 100644
--- a/test/jitter/jmp_out_mem.py
+++ b/test/jitter/jmp_out_mem.py
@@ -6,7 +6,7 @@ from miasm.core.locationdb import LocationDB
 
 
 def code_sentinelle(jitter):
-    jitter.run = False
+    jitter.running = False
     jitter.pc = 0
     return True
 
diff --git a/test/os_dep/linux/test_env.py b/test/os_dep/linux/test_env.py
index 5bf3d2a0..c9eb53dd 100644
--- a/test/os_dep/linux/test_env.py
+++ b/test/os_dep/linux/test_env.py
@@ -36,4 +36,4 @@ sb = sandbox(loc_db, options.filename, options, globals())
 # Run
 sb.run()
 
-assert(sb.jitter.run is False)
+assert(sb.jitter.running is False)