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/test/Makefile | |
| 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/test/Makefile')
| -rw-r--r-- | lib/common_test/test/Makefile | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/common_test/test/Makefile b/lib/common_test/test/Makefile index 4d85b84b5b..74b6c16274 100644 --- a/lib/common_test/test/Makefile +++ b/lib/common_test/test/Makefile @@ -39,6 +39,7 @@ MODULES= \ ct_sequence_1_SUITE \ ct_repeat_1_SUITE \ ct_testspec_1_SUITE \ + ct_testspec_2_SUITE \ ct_skip_SUITE \ ct_error_SUITE \ ct_test_server_if_1_SUITE \ @@ -46,7 +47,9 @@ MODULES= \ ct_master_SUITE \ ct_misc_1_SUITE \ ct_hooks_SUITE \ - ct_netconfc_SUITE + ct_netconfc_SUITE \ + ct_basic_html_SUITE \ + ct_auto_compile_SUITE ERL_FILES= $(MODULES:%=%.erl) |