diff options
| author | Micael Karlberg <[email protected]> | 2011-02-28 19:07:16 +0100 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2011-02-28 19:07:16 +0100 |
| commit | 7c1117fd0e509115fb17a1a101233f19be555991 (patch) | |
| tree | f0eeb2636a879bf37120b7b976ddf3979be8890d /lib/test_server/test/Makefile | |
| parent | 2c13b770cf24be58db1862afc38143d889ac2600 (diff) | |
| parent | 98d3b0c86ff3d99a4d175291df54c5ed48357fce (diff) | |
| download | otp-7c1117fd0e509115fb17a1a101233f19be555991.tar.gz otp-7c1117fd0e509115fb17a1a101233f19be555991.tar.bz2 otp-7c1117fd0e509115fb17a1a101233f19be555991.zip | |
Merge branch 'dev' into bmk/snmp/snmp419_integration/OTP-9068
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 = . |