aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/test/Makefile
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2013-08-08 10:28:48 +0200
committerLukas Larsson <[email protected]>2013-08-08 10:28:48 +0200
commitd787e64c8cf522b0f2fa2e26e0be154454fae4a8 (patch)
tree83a3c146f6f5e8ec000d8cb0d28a07c9dc17c24c /erts/emulator/test/Makefile
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/emulator/test/Makefile')
-rw-r--r--erts/emulator/test/Makefile3
1 files changed, 2 insertions, 1 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