diff options
| author | Lukas Larsson <[email protected]> | 2013-08-08 10:29:24 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2013-08-08 10:29:24 +0200 |
| commit | f5830abe5e91d5f93459f44c4403a4a0f640f38d (patch) | |
| tree | b4a0480ab082869c33f04f007b066e9da23b96e2 /erts | |
| parent | a44ae95751b309440c8419ec79d99abc94ff4d5f (diff) | |
| parent | d787e64c8cf522b0f2fa2e26e0be154454fae4a8 (diff) | |
| download | otp-f5830abe5e91d5f93459f44c4403a4a0f640f38d.tar.gz otp-f5830abe5e91d5f93459f44c4403a4a0f640f38d.tar.bz2 otp-f5830abe5e91d5f93459f44c4403a4a0f640f38d.zip | |
Merge branch 'maint'
* maint:
Add smoke tests
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/emulator/test/Makefile | 3 | ||||
| -rw-r--r-- | erts/emulator/test/emulator_smoke.spec | 3 | ||||
| -rw-r--r-- | erts/test/Makefile | 2 | ||||
| -rw-r--r-- | erts/test/system_smoke.spec | 3 |
4 files changed, 9 insertions, 2 deletions
diff --git a/erts/emulator/test/Makefile b/erts/emulator/test/Makefile index 9594ab48b1..f02ca3cb98 100644 --- a/erts/emulator/test/Makefile +++ b/erts/emulator/test/Makefile @@ -140,7 +140,8 @@ EMAKEFILE=Emakefile TEST_SPEC_FILES= emulator.spec \ emulator.spec.win \ - emulator_bench.spec + emulator_bench.spec \ + emulator_smoke.spec # ---------------------------------------------------- # Release directory specification diff --git a/erts/emulator/test/emulator_smoke.spec b/erts/emulator/test/emulator_smoke.spec new file mode 100644 index 0000000000..3219aeb823 --- /dev/null +++ b/erts/emulator/test/emulator_smoke.spec @@ -0,0 +1,3 @@ +{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 diff --git a/erts/test/Makefile b/erts/test/Makefile index 6b409e2f1b..74a5bb1ccc 100644 --- a/erts/test/Makefile +++ b/erts/test/Makefile @@ -79,7 +79,7 @@ release_spec: release_tests_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)" - $(INSTALL_DATA) system.spec system.dynspec \ + $(INSTALL_DATA) system.spec system.dynspec system_smoke.spec \ $(ERL_FILES) $(TARGET_FILES) "$(RELSYSDIR)" chmod -R u+w "$(RELSYSDIR)" tar cf - *_SUITE_data utils | (cd "$(RELSYSDIR)"; tar xf -) diff --git a/erts/test/system_smoke.spec b/erts/test/system_smoke.spec new file mode 100644 index 0000000000..933d1ba22d --- /dev/null +++ b/erts/test/system_smoke.spec @@ -0,0 +1,3 @@ +{suites,"../system_test",[ethread_SUITE]}. +{cases,"../system_test",otp_SUITE,[undefined_functions]}. +{skip_cases,"../system_test",ethread_SUITE,[max_threads],"Skip"}. |