Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Travis: avoid redundancy between parallel tests cases #938

Merged
merged 2 commits into from
Jan 14, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 12 additions & 9 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,17 @@ addons:
env:
global: CXX=g++-5 LLVM_CONFIG=llvm-config-6.0
matrix:
- MIASM_TEST_TAG=regression
- MIASM_TEST_TAG=example
- MIASM_TEST_TAG=long
- MIASM_TEST_TAG=llvm
- MIASM_TEST_TAG=gcc
- MIASM_TEST_TAG=z3
- MIASM_TEST_TAG=qemu
- MIASM_TEST_TAG=cparser
- MIASM_TEST_EXTRA_ARG="-o regression -t long,python,llvm,gcc,z3,qemu,cparser"
- MIASM_TEST_EXTRA_ARG="-o example -t long,python,llvm,gcc,z3,qemu,cparser"
- MIASM_TEST_EXTRA_ARG="-o long"
- MIASM_TEST_EXTRA_ARG="-o qemu -t llvm,gcc"
- MIASM_TEST_EXTRA_ARG="-o qemu -t python,gcc"
- MIASM_TEST_EXTRA_ARG="-o qemu -t python,llvm"
- MIASM_TEST_EXTRA_ARG="-o llvm -t qemu,long"
- MIASM_TEST_EXTRA_ARG="-o gcc -t qemu,long"
- MIASM_TEST_EXTRA_ARG="-o python -t qemu,long"
- MIASM_TEST_EXTRA_ARG="-o z3"
- MIASM_TEST_EXTRA_ARG="-o cparser"
before_script:
- pip install -r optional_requirements.txt
# codespell
Expand All @@ -28,4 +31,4 @@ before_script:
# install
- python setup.py build build_ext
- python setup.py install
script: cd test && python test_all.py -o=$MIASM_TEST_TAG && git ls-files -o --exclude-standard
script: cd test && python test_all.py $MIASM_TEST_EXTRA_ARG && git ls-files -o --exclude-standard
5 changes: 3 additions & 2 deletions test/test_all.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
"long": "LONG", # Very time consumming tests
"llvm": "LLVM", # LLVM dependency is required
"gcc": "GCC", # GCC based tests
"python": "PYTHON", # Python jitted tests
"z3": "Z3", # Z3 dependency is needed
"qemu": "QEMU", # QEMU tests (several tests)
"cparser": "CPARSER", # pycparser is needed
Expand Down Expand Up @@ -109,7 +110,7 @@ def __init__(self, script, jitter ,*args, **kwargs):
continue
testset += ArchUnitTest(script, jitter, base_dir="arch", tags=tags)

testset += ArchUnitTest("x86/unit/access_xmm.py", "python", base_dir="arch")
testset += ArchUnitTest("x86/unit/access_xmm.py", "python", base_dir="arch", tags=[TAGS["python"]])

### QEMU regression tests
class QEMUTest(RegressionTest):
Expand Down Expand Up @@ -750,7 +751,7 @@ class ExampleJitterNoPython(ExampleJitter):

for jitter in ExampleJitter.jitter_engines:
# Take 5 min on a Core i5
tags = {"python": [TAGS["long"]],
tags = {"python": [TAGS["long"], TAGS["python"]],
"llvm": [TAGS["llvm"]],
"gcc": [TAGS["gcc"]],
}
Expand Down