aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorLukas Larsson <lukas@erlang-solutions.com>2013-08-08 10:28:48 +0200
committerLukas Larsson <lukas@erlang-solutions.com>2013-08-08 10:28:48 +0200
commitd787e64c8cf522b0f2fa2e26e0be154454fae4a8 (patch)
tree83a3c146f6f5e8ec000d8cb0d28a07c9dc17c24c /erts
parent3fbbe6760a0476fccc2375dc8ca5791546dbc876 (diff)
parent86f970056b55ab8c33ecb6d0ce13924e3331b79a (diff)
downloadotp-d787e64c8cf522b0f2fa2e26e0be154454fae4a8.tar.gz
otp-d787e64c8cf522b0f2fa2e26e0be154454fae4a8.tar.bz2
otp-d787e64c8cf522b0f2fa2e26e0be154454fae4a8.zip
Merge branch 'lukas/smoketests/OTP-11221' into maint
* lukas/smoketests/OTP-11221: Add smoke tests
Diffstat (limited to 'erts')
-rw-r--r--erts/emulator/test/Makefile3
-rw-r--r--erts/emulator/test/emulator_smoke.spec3
-rw-r--r--erts/test/Makefile2
-rw-r--r--erts/test/system_smoke.spec3
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"}.