diff options
| author | Siri Hansen <[email protected]> | 2016-03-09 11:09:34 +0100 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2016-03-09 11:09:34 +0100 |
| commit | aeccfd1c8441ac0caa0c86aac19747eb64bd267d (patch) | |
| tree | c966abd0608a50aab2590671101090e819feb59d /lib/common_test/test/Makefile | |
| parent | 0b7c58e52ab6650d41be2ca58c4dc301287ba68a (diff) | |
| parent | 2e8369fa0932e076bda89fa6f15f9f3b99de074a (diff) | |
| download | otp-aeccfd1c8441ac0caa0c86aac19747eb64bd267d.tar.gz otp-aeccfd1c8441ac0caa0c86aac19747eb64bd267d.tar.bz2 otp-aeccfd1c8441ac0caa0c86aac19747eb64bd267d.zip | |
Merge branch 'maint'
Conflicts:
lib/common_test/test/Makefile
Diffstat (limited to 'lib/common_test/test/Makefile')
| -rw-r--r-- | lib/common_test/test/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/common_test/test/Makefile b/lib/common_test/test/Makefile index aa99fe1af1..fd96d06aab 100644 --- a/lib/common_test/test/Makefile +++ b/lib/common_test/test/Makefile @@ -68,7 +68,8 @@ MODULES= \ ct_telnet_SUITE \ erl2html2_SUITE \ test_server_SUITE \ - test_server_test_lib + test_server_test_lib \ + ct_release_test_SUITE ERL_FILES= $(MODULES:%=%.erl) HRL_FILES= test_server_test_lib.hrl |