about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorserpilliere <serpilliere@users.noreply.github.com>2015-02-17 12:31:24 +0100
committerserpilliere <serpilliere@users.noreply.github.com>2015-02-17 12:31:24 +0100
commit862f9f0c4785b85dbb64e2bf497767a68e9fed84 (patch)
tree869150485a173aba925911252dffc3ad0bf36f5e
parentc47688a9e8e049165a76b9bb3281c0381fa2d12f (diff)
parent98ff3797626fa942833a171f8803bd10b9cd97e3 (diff)
downloadmiasm-862f9f0c4785b85dbb64e2bf497767a68e9fed84.tar.gz
miasm-862f9f0c4785b85dbb64e2bf497767a68e9fed84.zip
Merge pull request #72 from commial/fix-testset
TestAll: Never launch tests from `miasm2` root (files are used before mo...
-rw-r--r--test/test_all.py10
1 files changed, 4 insertions, 6 deletions
diff --git a/test/test_all.py b/test/test_all.py
index 5f0721fc..a2fd6df3 100644
--- a/test/test_all.py
+++ b/test/test_all.py
@@ -48,13 +48,12 @@ for script in ["x86/sem.py",
 class SemanticTestAsm(RegressionTest):
     """Assemble an asm file"""
 
-    shellcode_script = os.path.join("example", "asm", "shellcode.py")
+    shellcode_script = os.path.join("..", "example", "asm", "shellcode.py")
     container_dct = {"PE": "--PE"}
 
     def __init__(self, arch, container, *args, **kwargs):
         super(SemanticTestAsm, self).__init__(*args, **kwargs)
-        self.base_dir = os.path.join(self.base_dir, "..")
-        sample_dir = os.path.join("test", "samples", arch)
+        sample_dir = os.path.join("samples", arch)
         base_filename = os.path.join(sample_dir, self.command_line[0])
         input_filename = base_filename + ".S"
         output_filename = base_filename + ".bin"
@@ -70,12 +69,11 @@ class SemanticTestExec(RegressionTest):
     """Execute a binary file"""
 
     launcher_dct = {("PE", "x86_64"): "sandbox_pe_x86_64.py"}
-    launcher_base = os.path.join("example", "jitter")
+    launcher_base = os.path.join("..", "example", "jitter")
 
     def __init__(self, arch, container, address, *args, **kwargs):
         super(SemanticTestExec, self).__init__(*args, **kwargs)
-        self.base_dir = os.path.join(self.base_dir, "..")
-        sample_dir = os.path.join("test", "samples", arch)
+        sample_dir = os.path.join("samples", arch)
         base_filename = os.path.join(sample_dir, self.command_line[0])
         input_filename = base_filename + ".bin"
         launcher = os.path.join(self.launcher_base,