diff options
| author | Sverker Eriksson <[email protected]> | 2018-03-28 09:43:53 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2018-03-28 09:43:53 +0200 |
| commit | f274b4cb369e1d4d8474c80595a992959770abf9 (patch) | |
| tree | 44c44d9101ee58a156bca56d2cde4e3963bf4ca8 /erts/emulator/test | |
| parent | ce212ce8241e57c344c55df53b20965181cc6756 (diff) | |
| parent | 39cf4e75f31e9abe46c9fe39000368c1243fdcf3 (diff) | |
| download | otp-f274b4cb369e1d4d8474c80595a992959770abf9.tar.gz otp-f274b4cb369e1d4d8474c80595a992959770abf9.tar.bz2 otp-f274b4cb369e1d4d8474c80595a992959770abf9.zip | |
Merge branch 'sverker/driver-taints/OTP-14960'
* sverker/driver-taints/OTP-14960:
erts: Include foreign static linked drivers in taints
erts: Fix harmless bug in macro IS_DRIVER_VERSION_GE
erts: Remove our own NIF modules from "taints"
erts: Refactor erts_static_nif_get_nif_init
erts: Add dynamic loaded drivers to list of "taints"
Diffstat (limited to 'erts/emulator/test')
| -rw-r--r-- | erts/emulator/test/driver_SUITE.erl | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/erts/emulator/test/driver_SUITE.erl b/erts/emulator/test/driver_SUITE.erl index 294c42780d..40c7cc11e1 100644 --- a/erts/emulator/test/driver_SUITE.erl +++ b/erts/emulator/test/driver_SUITE.erl @@ -2589,8 +2589,18 @@ stop_driver(Port, Name) -> ok = erl_ddll:stop(). load_driver(Dir, Driver) -> + Before = erlang:system_info(taints), case erl_ddll:load_driver(Dir, Driver) of - ok -> ok; + ok -> + After = erlang:system_info(taints), + case lists:member(Driver, Before) of + true -> + After = Before; + false -> + true = lists:member(Driver, After), + Before = lists:delete(Driver, After) + end, + ok; {error, Error} = Res -> io:format("~s\n", [erl_ddll:format_error(Error)]), Res |