diff options
author | Ingela Anderton Andin <[email protected]> | 2013-12-02 10:24:56 +0100 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2013-12-02 10:24:56 +0100 |
commit | c3d9d667e028284d6f96f8e260d094f1775182ea (patch) | |
tree | f88229efc098d69e798132acc540835e11e24571 /lib/ssl/test/ssl_dist_SUITE.erl | |
parent | f2fc6a63429f0c7945e7644e5fe3d8ee265bd28f (diff) | |
parent | 239ce1c4781fe4fc25c55795573654453887f507 (diff) | |
download | otp-c3d9d667e028284d6f96f8e260d094f1775182ea.tar.gz otp-c3d9d667e028284d6f96f8e260d094f1775182ea.tar.bz2 otp-c3d9d667e028284d6f96f8e260d094f1775182ea.zip |
Merge branch 'maint'
Diffstat (limited to 'lib/ssl/test/ssl_dist_SUITE.erl')
-rw-r--r-- | lib/ssl/test/ssl_dist_SUITE.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ssl/test/ssl_dist_SUITE.erl b/lib/ssl/test/ssl_dist_SUITE.erl index 7bfd678f4b..d3b523ca8c 100644 --- a/lib/ssl/test/ssl_dist_SUITE.erl +++ b/lib/ssl/test/ssl_dist_SUITE.erl @@ -95,7 +95,7 @@ common_init(Case, Config) -> end_per_testcase(Case, Config) when is_list(Config) -> Flags = proplists:get_value(old_flags, Config), - os:putenv("ERL_FLAGS", Flags), + catch os:putenv("ERL_FLAGS", Flags), common_end(Case, Config). common_end(_, Config) -> |