diff options
| author | Björn Gustavsson <[email protected]> | 2016-12-15 11:53:52 +0100 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2016-12-15 11:53:52 +0100 |
| commit | ad2cd9e1db72dfccbd72a057b58bb90c6e000ca5 (patch) | |
| tree | 7e167dbb2f9fe8e1aca9137bdee8332dbe3b9349 /erts | |
| parent | c2a8b35fef671321509bfaf4f607fa83fd0ccdbe (diff) | |
| parent | 200f19dc582e33a6f811b05e3deec987fc67915a (diff) | |
| download | otp-ad2cd9e1db72dfccbd72a057b58bb90c6e000ca5.tar.gz otp-ad2cd9e1db72dfccbd72a057b58bb90c6e000ca5.tar.bz2 otp-ad2cd9e1db72dfccbd72a057b58bb90c6e000ca5.zip | |
Merge branch 'maint'
* maint:
Create CONTRIBUTING.md (#1278)
Make sure that Travis fails when test cases fail
Don't include problematic test cases in smoke test
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/emulator/test/emulator_smoke.spec | 12 |
1 files changed, 9 insertions, 3 deletions
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]}. |