diff options
| author | Peter Andersson <[email protected]> | 2012-08-23 16:07:23 +0200 |
|---|---|---|
| committer | Peter Andersson <[email protected]> | 2012-08-23 16:08:16 +0200 |
| commit | 4173064b7044d72f650cf459683793acc9e29352 (patch) | |
| tree | d0def2875976ba6fcf2cf9e2775ade845ad5cace /lib/common_test/src/ct_util.hrl | |
| parent | 474e2e4485eaf6da0b325ad7c7e79b29fac262b7 (diff) | |
| parent | ecf119feda32c0692bf688462ced24efa35789f1 (diff) | |
| download | otp-4173064b7044d72f650cf459683793acc9e29352.tar.gz otp-4173064b7044d72f650cf459683793acc9e29352.tar.bz2 otp-4173064b7044d72f650cf459683793acc9e29352.zip | |
Merge remote branch 'origin/peppe/common_test/testspec_updates' into maint
* origin/peppe/common_test/testspec_updates:
Test new testspec functionality and correct bugs
Implement constants and new features for test specifications
Conflicts:
lib/common_test/src/ct_run.erl
lib/common_test/test/Makefile
OTP-10049
OTP-10089
OTP-10145
Diffstat (limited to 'lib/common_test/src/ct_util.hrl')
| -rw-r--r-- | lib/common_test/src/ct_util.hrl | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/common_test/src/ct_util.hrl b/lib/common_test/src/ct_util.hrl index 31341c7b55..297d7c665a 100644 --- a/lib/common_test/src/ct_util.hrl +++ b/lib/common_test/src/ct_util.hrl @@ -34,13 +34,17 @@ profile=[], logdir=["."], logopts=[], + basic_html=[], cover=[], config=[], userconfig=[], event_handler=[], ct_hooks=[], enable_builtin_hooks=true, + noinput=false, include=[], + auto_compile=[], + stylesheet=[], multiply_timetraps=[], scale_timetraps=[], create_priv_dir=[], |