aboutsummaryrefslogtreecommitdiffstats
path: root/erts/test
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2013-08-08 10:29:24 +0200
committerLukas Larsson <[email protected]>2013-08-08 10:29:24 +0200
commitf5830abe5e91d5f93459f44c4403a4a0f640f38d (patch)
treeb4a0480ab082869c33f04f007b066e9da23b96e2 /erts/test
parenta44ae95751b309440c8419ec79d99abc94ff4d5f (diff)
parentd787e64c8cf522b0f2fa2e26e0be154454fae4a8 (diff)
downloadotp-f5830abe5e91d5f93459f44c4403a4a0f640f38d.tar.gz
otp-f5830abe5e91d5f93459f44c4403a4a0f640f38d.tar.bz2
otp-f5830abe5e91d5f93459f44c4403a4a0f640f38d.zip
Merge branch 'maint'
* maint: Add smoke tests
Diffstat (limited to 'erts/test')
-rw-r--r--erts/test/Makefile2
-rw-r--r--erts/test/system_smoke.spec3
2 files changed, 4 insertions, 1 deletions
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"}.