aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorRickard Green <rickard@erlang.org>2017-04-11 18:10:49 +0200
committerRickard Green <rickard@erlang.org>2017-04-11 18:10:49 +0200
commit4da32ec432dd2dee0b19403bed21a836f1638549 (patch)
tree61770f4529a2c4382b4c8ab1e1369da3e7d2eab1 /erts
parent6fe2b8593d05b09c75baabf94a265135709ebef9 (diff)
parent5f4324e9d9a3bd99cd06f622cb3c9c50783764ac (diff)
downloadotp-4da32ec432dd2dee0b19403bed21a836f1638549.tar.gz
otp-4da32ec432dd2dee0b19403bed21a836f1638549.tar.bz2
otp-4da32ec432dd2dee0b19403bed21a836f1638549.zip
Merge branch 'rickard/node_container_SUITE.spec'
* rickard/node_container_SUITE.spec: Add node_container_SUITE spec
Diffstat (limited to 'erts')
-rw-r--r--erts/emulator/test/Makefile3
-rw-r--r--erts/emulator/test/emulator_node_container_SUITE.spec2
2 files changed, 4 insertions, 1 deletions
diff --git a/erts/emulator/test/Makefile b/erts/emulator/test/Makefile
index 5478932b13..186f9fef8d 100644
--- a/erts/emulator/test/Makefile
+++ b/erts/emulator/test/Makefile
@@ -157,7 +157,8 @@ EMAKEFILE=Emakefile
TEST_SPEC_FILES= emulator.spec \
emulator.spec.win \
emulator_bench.spec \
- emulator_smoke.spec
+ emulator_smoke.spec \
+ emulator_node_container_SUITE.spec
# ----------------------------------------------------
# Release directory specification
diff --git a/erts/emulator/test/emulator_node_container_SUITE.spec b/erts/emulator/test/emulator_node_container_SUITE.spec
new file mode 100644
index 0000000000..77c28ba7ae
--- /dev/null
+++ b/erts/emulator/test/emulator_node_container_SUITE.spec
@@ -0,0 +1,2 @@
+{enable_builtin_hooks, false}.
+{suites,"../emulator_test",node_container_SUITE}.