aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/test/smoke_test_SUITE.erl
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2017-04-25 11:01:10 +0200
committerLukas Larsson <[email protected]>2017-04-25 11:01:10 +0200
commit6b57999ee020e5b1ebd8781ad7008b14cdd49688 (patch)
tree0adbdb7225eec95ea456d8cf74d5a210ce5f219d /erts/emulator/test/smoke_test_SUITE.erl
parent0eb103aa9e05b88e4c4337973b16ed2a7e0039f7 (diff)
parent8434b76e48b4ad1fe47b1d38dc3cac0b50d7d52d (diff)
downloadotp-6b57999ee020e5b1ebd8781ad7008b14cdd49688.tar.gz
otp-6b57999ee020e5b1ebd8781ad7008b14cdd49688.tar.bz2
otp-6b57999ee020e5b1ebd8781ad7008b14cdd49688.zip
Merge branch 'lukas/erts/deprecate-non-smp/OTP-14272'
* lukas/erts/deprecate-non-smp/OTP-14272: erts: Fix testcases for smp +S 1:1 erts: Deprecate the non-smp emulators
Diffstat (limited to 'erts/emulator/test/smoke_test_SUITE.erl')
-rw-r--r--erts/emulator/test/smoke_test_SUITE.erl7
1 files changed, 0 insertions, 7 deletions
diff --git a/erts/emulator/test/smoke_test_SUITE.erl b/erts/emulator/test/smoke_test_SUITE.erl
index 5eccdc562b..45b28b28a5 100644
--- a/erts/emulator/test/smoke_test_SUITE.erl
+++ b/erts/emulator/test/smoke_test_SUITE.erl
@@ -66,17 +66,10 @@ boot_combo(Config) when is_list(Config) ->
ok
end
end,
- SMPDisable = fun () -> false = erlang:system_info(smp_support) end,
try
chk_boot(Config, "+Ktrue", NOOP),
chk_boot(Config, "+A42", A42),
- chk_boot(Config, "-smp disable", SMPDisable),
chk_boot(Config, "+Ktrue +A42", A42),
- chk_boot(Config, "-smp disable +A42",
- fun () -> SMPDisable(), A42() end),
- chk_boot(Config, "-smp disable +Ktrue", SMPDisable),
- chk_boot(Config, "-smp disable +Ktrue +A42",
- fun () -> SMPDisable(), A42() end),
%% A lot more combos could be implemented...
ok
after