diff options
| author | Siri Hansen <[email protected]> | 2012-03-05 11:43:08 +0100 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2012-03-05 11:43:08 +0100 |
| commit | 096ed7e301ce16dfb69709d7001ea3d5f370c202 (patch) | |
| tree | d2a6f3dd000d2a1ce843d5c687498b9d43cc4879 /lib/stdlib/test/Makefile | |
| parent | d1e67d51a6d754e5a055c81c9d7447e0d87e982f (diff) | |
| parent | e6e31791abf090fe7e0bd3e5970b44830d087c4a (diff) | |
| download | otp-096ed7e301ce16dfb69709d7001ea3d5f370c202.tar.gz otp-096ed7e301ce16dfb69709d7001ea3d5f370c202.tar.bz2 otp-096ed7e301ce16dfb69709d7001ea3d5f370c202.zip | |
Merge branch 'siri/stdlib/hanging-restart-loop/OTP-9549' into maint
* siri/stdlib/hanging-restart-loop/OTP-9549:
Leave control back to gen_server during supervisor's restart loop
Diffstat (limited to 'lib/stdlib/test/Makefile')
| -rw-r--r-- | lib/stdlib/test/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/stdlib/test/Makefile b/lib/stdlib/test/Makefile index b36265302c..4de6ea3ee7 100644 --- a/lib/stdlib/test/Makefile +++ b/lib/stdlib/test/Makefile @@ -67,6 +67,7 @@ MODULES= \ string_SUITE \ supervisor_1 \ supervisor_2 \ + supervisor_deadlock \ naughty_child \ shell_SUITE \ supervisor_SUITE \ |