diff options
| author | Sverker Eriksson <[email protected]> | 2014-02-19 16:50:00 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2014-02-19 16:50:00 +0100 |
| commit | 5cdba8e38d1e2043959a20739e435cc56453240b (patch) | |
| tree | aeceb4ad5138729903f1f70f47e19df57aaf1233 /erts/emulator/test/driver_SUITE.erl | |
| parent | a40cc981b6b13d9a6514d2c326eb5f4904f80983 (diff) | |
| parent | c3fb1d51b73867a9045171e812cc0acb82126edd (diff) | |
| download | otp-5cdba8e38d1e2043959a20739e435cc56453240b.tar.gz otp-5cdba8e38d1e2043959a20739e435cc56453240b.tar.bz2 otp-5cdba8e38d1e2043959a20739e435cc56453240b.zip | |
Merge branch 'sverk/test_server/openbsd-dynlink'
* sverk/test_server/openbsd-dynlink:
erts: Skip driver_SUITE:thr_free_drv for VM without threads
erts: Fix driver_SUITE:otp_9302 for VM without threads
test_server: Fix dynlib link command for openbsd
Diffstat (limited to 'erts/emulator/test/driver_SUITE.erl')
| -rw-r--r-- | erts/emulator/test/driver_SUITE.erl | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/erts/emulator/test/driver_SUITE.erl b/erts/emulator/test/driver_SUITE.erl index 06211406b4..c62bc0c454 100644 --- a/erts/emulator/test/driver_SUITE.erl +++ b/erts/emulator/test/driver_SUITE.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1997-2013. All Rights Reserved. +%% Copyright Ericsson AB 1997-2014. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -1945,6 +1945,14 @@ otp_9302(Config) when is_list(Config) -> end. thr_free_drv(Config) when is_list(Config) -> + case erlang:system_info(threads) of + false -> + {skipped, "No thread support"}; + true -> + thr_free_drv_do(Config) + end. + +thr_free_drv_do(Config) -> ?line Path = ?config(data_dir, Config), ?line erl_ddll:start(), ?line ok = load_driver(Path, thr_free_drv), |