aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/test/Makefile
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2018-11-15 15:48:38 +0100
committerSverker Eriksson <[email protected]>2018-11-15 15:48:38 +0100
commitefe633d2c22daea6225935a2945fa5d3dd70e50c (patch)
tree7f111f09a6c261be777831578adb8aad6b970c9e /erts/emulator/test/Makefile
parent870ff6a1ec52003b8b67d3bbfaf68a28184bd0b6 (diff)
parentfefb5d039e87ff7137e78b3d5f2eaf01e498ec4d (diff)
downloadotp-efe633d2c22daea6225935a2945fa5d3dd70e50c.tar.gz
otp-efe633d2c22daea6225935a2945fa5d3dd70e50c.tar.bz2
otp-efe633d2c22daea6225935a2945fa5d3dd70e50c.zip
Merge branch 'sverker/erts/atomics-counters/OTP-13468' into maint
* sverker/erts/atomics-counters/OTP-13468: erts: Add new module 'counters' erts: Add new module 'atomics'
Diffstat (limited to 'erts/emulator/test/Makefile')
-rw-r--r--erts/emulator/test/Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/erts/emulator/test/Makefile b/erts/emulator/test/Makefile
index d201ea6ee1..6a064ec8d4 100644
--- a/erts/emulator/test/Makefile
+++ b/erts/emulator/test/Makefile
@@ -33,6 +33,7 @@ MODULES= \
after_SUITE \
alloc_SUITE \
async_ports_SUITE \
+ atomics_SUITE \
beam_SUITE \
beam_literals_SUITE \
bif_SUITE \
@@ -50,6 +51,7 @@ MODULES= \
call_trace_SUITE \
code_SUITE \
code_parallel_load_SUITE \
+ counters_SUITE \
crypto_SUITE \
ddll_SUITE \
decode_packet_SUITE \