diff options
| author | Lukas <[email protected]> | 2011-09-26 12:28:09 +0200 |
|---|---|---|
| committer | Lukas <[email protected]> | 2011-09-26 12:28:09 +0200 |
| commit | 1eb09dda09fa3de6b05f09d881065a0a7de2624f (patch) | |
| tree | 66f2a313b5ed62036744b72b03c108eafcdc1372 /lib/common_test/src/Makefile | |
| parent | a5baff1ab34518a5282da7ec9a32ac8ec991d4b4 (diff) | |
| parent | 516cbd4312c6fc8ca082d763b9a295acbc7e395c (diff) | |
| download | otp-1eb09dda09fa3de6b05f09d881065a0a7de2624f.tar.gz otp-1eb09dda09fa3de6b05f09d881065a0a7de2624f.tar.bz2 otp-1eb09dda09fa3de6b05f09d881065a0a7de2624f.zip | |
Merge branch 'dev' into major
* dev:
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 5b23558a96..125aa828fb 100644 --- a/lib/common_test/src/Makefile +++ b/lib/common_test/src/Makefile @@ -68,7 +68,8 @@ MODULES= \ ct_config_xml \ ct_slave \ ct_hooks\ - ct_hooks_lock + ct_hooks_lock\ + cth_log_redirect TARGET_MODULES= $(MODULES:%=$(EBIN)/%) BEAM_FILES= $(MODULES:%=$(EBIN)/%.$(EMULATOR)) |