diff options
| author | Siri Hansen <[email protected]> | 2011-11-17 16:30:25 +0100 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2011-11-17 16:30:25 +0100 |
| commit | 1c995165c752468c5c49f84b0c1bae7991cde008 (patch) | |
| tree | 3fc69294087e7672c5bfd1025467b165141c5229 /lib/kernel/test/application_SUITE_data/Makefile.src | |
| parent | 80775f1e41a38a617f779bc14736d8b281c12839 (diff) | |
| parent | 77ffc0d747f913c47d9e5305907a407d87883ba2 (diff) | |
| download | otp-1c995165c752468c5c49f84b0c1bae7991cde008.tar.gz otp-1c995165c752468c5c49f84b0c1bae7991cde008.tar.bz2 otp-1c995165c752468c5c49f84b0c1bae7991cde008.zip | |
Merge branch 'siri/kernel/application-shutdown-timeout/OTP-9540'
* siri/kernel/application-shutdown-timeout/OTP-9540:
Add documentation and test for kernel env var shutdown_timeout
Add env var shutdown_timeout to kernel to avoid deadlock on node shutdown
Diffstat (limited to 'lib/kernel/test/application_SUITE_data/Makefile.src')
| -rw-r--r-- | lib/kernel/test/application_SUITE_data/Makefile.src | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/kernel/test/application_SUITE_data/Makefile.src b/lib/kernel/test/application_SUITE_data/Makefile.src index a237f6badb..abc3c82907 100644 --- a/lib/kernel/test/application_SUITE_data/Makefile.src +++ b/lib/kernel/test/application_SUITE_data/Makefile.src @@ -2,7 +2,8 @@ EFLAGS=+debug_info all: app_start_error.@EMULATOR@ trans_abnormal_sup.@EMULATOR@ \ trans_normal_sup.@EMULATOR@ transient.@EMULATOR@ \ - group_leader_sup.@EMULATOR@ group_leader.@EMULATOR@ + group_leader_sup.@EMULATOR@ group_leader.@EMULATOR@ \ + deadlock/deadlock.@EMULATOR@ app_start_error.@EMULATOR@: app_start_error.erl erlc $(EFLAGS) app_start_error.erl @@ -22,3 +23,5 @@ group_leader.@EMULATOR@: group_leader.erl group_leader_sup.@EMULATOR@: group_leader_sup.erl erlc $(EFLAGS) group_leader_sup.erl +deadlock/deadlock.@EMULATOR@: deadlock/deadlock.erl + erlc $(EFLAGS) -o deadlock deadlock/deadlock.erl
\ No newline at end of file |