diff options
| author | Björn Gustavsson <[email protected]> | 2016-12-15 11:49:16 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2016-12-15 11:49:16 +0100 |
| commit | d708bbbda37c8f0d5970e169c94bb3537dc12f62 (patch) | |
| tree | 02331f735c3ab2d3102a557e538b6c3b77bbdf32 | |
| parent | 3473ecd83a7bbe7e0bebb865f25dddb93e3bf10f (diff) | |
| parent | 709be2f95c1df3b684e3ce036b98bdda3efa3f09 (diff) | |
| download | otp-d708bbbda37c8f0d5970e169c94bb3537dc12f62.tar.gz otp-d708bbbda37c8f0d5970e169c94bb3537dc12f62.tar.bz2 otp-d708bbbda37c8f0d5970e169c94bb3537dc12f62.zip | |
Merge pull request #1277 from bjorng/bjorn/travis-run-tests
Make sure that Travis fails when test cases fail
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | erts/emulator/test/emulator_smoke.spec | 12 | ||||
| -rwxr-xr-x | scripts/run-smoke-tests | 10 |
3 files changed, 20 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index 43bf0c7fb5..ef17d6fbe7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,4 +40,4 @@ after_success: - ./otp_build tests && make release_docs after_script: - - cd $ERL_TOP/release/tests/test_server && $ERL_TOP/bin/erl -s ts install -s ts smoke_test batch -s init stop + - ./scripts/run-smoke-tests diff --git a/erts/emulator/test/emulator_smoke.spec b/erts/emulator/test/emulator_smoke.spec index 3219aeb823..b2d0de8835 100644 --- a/erts/emulator/test/emulator_smoke.spec +++ b/erts/emulator/test/emulator_smoke.spec @@ -1,3 +1,9 @@ -{suites,"../emulator_test",[smoke_test_SUITE,time_SUITE]}. -{cases,"../emulator_test",crypto_SUITE,[t_md5]}. -{cases,"../emulator_test",float_SUITE,[fpe,cmp_integer]}.
\ No newline at end of file +{define,'Dir',"../emulator_test"}. +{suites,'Dir',[smoke_test_SUITE]}. +{suites,'Dir',[time_SUITE]}. +{skip_cases,'Dir',time_SUITE, + [univ_to_local,local_to_univ],"Depends on CET timezone"}. +{skip_cases,'Dir',time_SUITE, + [consistency],"Not reliable in October and March"}. +{cases,'Dir',crypto_SUITE,[t_md5]}. +{cases,'Dir',float_SUITE,[fpe,cmp_integer]}. diff --git a/scripts/run-smoke-tests b/scripts/run-smoke-tests new file mode 100755 index 0000000000..c2333e7825 --- /dev/null +++ b/scripts/run-smoke-tests @@ -0,0 +1,10 @@ +#!/bin/bash +set -ev + +cd $ERL_TOP/release/tests/test_server +$ERL_TOP/bin/erl -s ts install -s ts smoke_test batch -s init stop + +if grep -q '=failed *[1-9]' ct_run.test_server@*/*/run.*/suite.log; then + echo "One or more tests failed." + exit 1 +fi |