diff options
| author | Lukas Larsson <[email protected]> | 2011-02-28 17:30:09 +0100 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2011-02-28 17:30:09 +0100 |
| commit | e4dca28b4dc0397d2fc37d9853452f5abc9c4211 (patch) | |
| tree | ee03529859154b30cdb67eadc03fd155247c68f4 /lib/test_server/test/Makefile | |
| parent | 68fd8d31a869908d008f8262310a0a1e6a12505b (diff) | |
| parent | 19fa4c92edb358adaf21557b1a019a868d9e2af5 (diff) | |
| download | otp-e4dca28b4dc0397d2fc37d9853452f5abc9c4211.tar.gz otp-e4dca28b4dc0397d2fc37d9853452f5abc9c4211.tar.bz2 otp-e4dca28b4dc0397d2fc37d9853452f5abc9c4211.zip | |
Merge branch 'lukas/test_server/ts_migration/OTP-8768' into dev
* lukas/test_server/ts_migration/OTP-8768:
Update test_server tests to conform with common_test standard
Remove old test_server code
Diffstat (limited to 'lib/test_server/test/Makefile')
| -rw-r--r-- | lib/test_server/test/Makefile | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/lib/test_server/test/Makefile b/lib/test_server/test/Makefile index 9fe5aee3bb..0648c1f96a 100644 --- a/lib/test_server/test/Makefile +++ b/lib/test_server/test/Makefile @@ -27,11 +27,7 @@ include $(ERL_TOP)/make/$(TARGET)/otp.mk MODULES= \ test_server_SUITE \ test_server_line_SUITE \ - test_server_skip_SUITE \ - test_server_conf01_SUITE \ - test_server_conf02_SUITE \ - test_server_parallel01_SUITE \ - test_server_shuffle01_SUITE + test_server_test_lib ERL_FILES= $(MODULES:%=%.erl) @@ -52,6 +48,7 @@ RELSYSDIR = $(RELEASE_PATH)/test_server_test ERL_MAKE_FLAGS += -pa $(ERL_TOP)/lib/test_server/ebin ERL_COMPILE_FLAGS += -I$(ERL_TOP)/lib/test_server/include +ERL_COMPILE_FLAGS += -I$(ERL_TOP)/lib/test_server/test EBIN = . |