diff options
| author | Lukas <[email protected]> | 2011-09-26 12:01:57 +0200 |
|---|---|---|
| committer | Lukas <[email protected]> | 2011-09-26 12:01:57 +0200 |
| commit | 516cbd4312c6fc8ca082d763b9a295acbc7e395c (patch) | |
| tree | d9e8ff409547a52497ff53e75b2216f80d759d62 /lib/common_test/src/Makefile | |
| parent | 97f3a064f27843a9f825210c1c7a27075b7b3ad7 (diff) | |
| parent | 7d0d76f3a8170ddb5a3b07fd46fce835bb631cef (diff) | |
| download | otp-516cbd4312c6fc8ca082d763b9a295acbc7e395c.tar.gz otp-516cbd4312c6fc8ca082d763b9a295acbc7e395c.tar.bz2 otp-516cbd4312c6fc8ca082d763b9a295acbc7e395c.zip | |
Merge branch 'lukas/common_test/system_logs_to_ct_log/OTP-9543' into dev
* lukas/common_test/system_logs_to_ct_log/OTP-9543:
Add documentation for cth_log_redirect and built-in hooks
Correct wrong match from lists:keyfind
Update cth_log_redirect to wait for all error_logger events before ending test
Force logging to framework log for parallel tests
Add ct_log:ct_log funcion
Add a hook for redirecting SASL and error_logger messages
Add -enable_builtin_hooks <bool> config option
Export write_events and add option to return a string
Diffstat (limited to 'lib/common_test/src/Makefile')
| -rw-r--r-- | lib/common_test/src/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/common_test/src/Makefile b/lib/common_test/src/Makefile index 84b122b5e4..51624fbde7 100644 --- a/lib/common_test/src/Makefile +++ b/lib/common_test/src/Makefile @@ -69,7 +69,8 @@ MODULES= \ ct_config_xml \ ct_slave \ ct_hooks\ - ct_hooks_lock + ct_hooks_lock\ + cth_log_redirect TARGET_MODULES= $(MODULES:%=$(EBIN)/%) |