about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorserpilliere <serpilliere@users.noreply.github.com>2019-06-17 20:30:34 +0200
committerGitHub <noreply@github.com>2019-06-17 20:30:34 +0200
commitdcb81290c1c828a49cdb85fbab89f44ea251deb3 (patch)
tree02a2d9d175ad7951487053576807fd6197d452ad
parentfa1bb958fdfbbe0eb5aaccb745aa97a3677c8b73 (diff)
parentcf63cc425f15772f9c3dfdb2bb27629f0f3feda4 (diff)
downloadmiasm-dcb81290c1c828a49cdb85fbab89f44ea251deb3.tar.gz
miasm-dcb81290c1c828a49cdb85fbab89f44ea251deb3.zip
Merge pull request #998 from commial/feature/extensive-tests
Extended tests - reintroduce ls tests with extern repository
-rw-r--r--.travis.yml7
-rw-r--r--miasm/arch/x86/sem.py10
2 files changed, 16 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index e395e804..957ef09d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,6 +24,7 @@ env:
     - MIASM_TEST_EXTRA_ARG="-o python -t qemu,long"
     - MIASM_TEST_EXTRA_ARG="-o z3"
     - MIASM_TEST_EXTRA_ARG="-o cparser"
+    - MIASM_EXTENTED_TESTS="ls_x64"
 before_script:
 - pip install -r optional_requirements.txt
 # codespell
@@ -31,4 +32,8 @@ before_script:
 # install
 - python setup.py build build_ext
 - python setup.py install
-script: cd test && flags=""; python --version |& grep -q "Python 3" || flags="-W error"; python $flags test_all.py $MIASM_TEST_EXTRA_ARG && git ls-files -o --exclude-standard
+# extended tests
+- git clone https://github.com/cea-sec/miasm-extended-tests
+script:
+  - test -z "$MIASM_TEST_EXTRA_ARG" || (cd test && flags=""; python --version |& grep -q "Python 3" || flags="-W error"; python $flags test_all.py $MIASM_TEST_EXTRA_ARG && git ls-files -o --exclude-standard)
+  - test -z "$MIASM_EXTENTED_TESTS" || (cd "miasm-extended-tests/$MIASM_EXTENTED_TESTS" && ./run.sh "$TRAVIS_BUILD_DIR")
diff --git a/miasm/arch/x86/sem.py b/miasm/arch/x86/sem.py
index 1af9359e..3d38a9be 100644
--- a/miasm/arch/x86/sem.py
+++ b/miasm/arch/x86/sem.py
@@ -5078,6 +5078,14 @@ def movmskpd(ir, instr, dst, src):
         out.append(src[(64 * i) + 63:(64 * i) + 64])
     return [m2_expr.ExprAssign(dst, m2_expr.ExprCompose(*out).zeroExtend(dst.size))], []
 
+def fxsave(_ir, _instr, _src):
+    # Implemented as a NOP for now
+    return [], []
+
+def fxrstor(_ir, _instr, _dst):
+    # Implemented as a NOP for now
+    return [], []
+
 
 mnemo_func = {'mov': mov,
               'xchg': xchg,
@@ -5679,6 +5687,8 @@ mnemo_func = {'mov': mov,
               "clrssbsy": clrssbsy,
               "endbr64": endbr64,
               "endbr32": endbr32,
+              "fxsave": fxsave,
+              "fxrstor": fxrstor,
               }