aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2016-12-15 11:49:16 +0100
committerGitHub <[email protected]>2016-12-15 11:49:16 +0100
commitd708bbbda37c8f0d5970e169c94bb3537dc12f62 (patch)
tree02331f735c3ab2d3102a557e538b6c3b77bbdf32 /erts
parent3473ecd83a7bbe7e0bebb865f25dddb93e3bf10f (diff)
parent709be2f95c1df3b684e3ce036b98bdda3efa3f09 (diff)
downloadotp-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
Diffstat (limited to 'erts')
-rw-r--r--erts/emulator/test/emulator_smoke.spec12
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]}.