diff options
| author | Lukas Larsson <[email protected]> | 2017-07-13 12:28:49 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2017-07-17 10:01:53 +0200 |
| commit | 2a84c3d7f6822f1293ad860cf094b549fd3fe634 (patch) | |
| tree | 93814b8b53448a6769424d70e2dcce6974d5b474 /lib/common_test | |
| parent | 0a0d797a4b7609e52ce5dba6fcb19e315588cb9f (diff) | |
| download | otp-2a84c3d7f6822f1293ad860cf094b549fd3fe634.tar.gz otp-2a84c3d7f6822f1293ad860cf094b549fd3fe634.tar.bz2 otp-2a84c3d7f6822f1293ad860cf094b549fd3fe634.zip | |
Fix testcases after removal of non-smp emulator
Diffstat (limited to 'lib/common_test')
| -rw-r--r-- | lib/common_test/test_server/ts_install.erl | 18 | ||||
| -rw-r--r-- | lib/common_test/test_server/ts_run.erl | 6 |
2 files changed, 8 insertions, 16 deletions
diff --git a/lib/common_test/test_server/ts_install.erl b/lib/common_test/test_server/ts_install.erl index c4e0223ac7..c5631fb9c3 100644 --- a/lib/common_test/test_server/ts_install.erl +++ b/lib/common_test/test_server/ts_install.erl @@ -408,17 +408,13 @@ off_heap_msgq() -> end. schedulers() -> - case catch erlang:system_info(smp_support) of - true -> - case {erlang:system_info(schedulers), - erlang:system_info(schedulers_online)} of - {S,S} -> - "/S"++integer_to_list(S); - {S,O} -> - "/S"++integer_to_list(S) ++ ":" ++ - integer_to_list(O) - end; - _ -> "" + case {erlang:system_info(schedulers), + erlang:system_info(schedulers_online)} of + {S,S} -> + "/S"++integer_to_list(S); + {S,O} -> + "/S"++integer_to_list(S) ++ ":" ++ + integer_to_list(O) end. bind_type() -> diff --git a/lib/common_test/test_server/ts_run.erl b/lib/common_test/test_server/ts_run.erl index 82ae44ec06..ec4a54b249 100644 --- a/lib/common_test/test_server/ts_run.erl +++ b/lib/common_test/test_server/ts_run.erl @@ -204,11 +204,7 @@ make_command(Vars, Spec, State) -> _ -> ok end, - "cerl -valgrind" ++ - case erlang:system_info(smp_support) of - true -> " -smp"; - false -> "" - end + "cerl -valgrind" end, Naming = case ts_lib:var(longnames, Vars) of |