From dc1e683111376624644a9a60df86cb341f7a554d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= Date: Wed, 10 Mar 2010 07:14:46 +0100 Subject: asn1 tests: Don't refer to $ERL_TOP in compiler options On Windows, $ERL_TOP contains a cygwin-style pathname that can be used in Makefiles to (for instance) include other Makefiles, but must not be passed to non-cygwin programs such as "erlc". Therefore, using compiler options such as "-I $(ERL_TOP)/lib/test_server/include" will not work on Windows. Fix this problem by include "test_server.hrl" using -include_lib() instead of -include(). That works because -include_lib() searches for include files in the code path without the need for any -I options. --- lib/asn1/test/Makefile | 2 -- 1 file changed, 2 deletions(-) (limited to 'lib/asn1/test/Makefile') diff --git a/lib/asn1/test/Makefile b/lib/asn1/test/Makefile index 879e51c632..879447e816 100644 --- a/lib/asn1/test/Makefile +++ b/lib/asn1/test/Makefile @@ -145,8 +145,6 @@ RELSYSDIR = $(RELEASE_PATH)/asn1_test # ---------------------------------------------------- # FLAGS # ---------------------------------------------------- -ERL_COMPILE_FLAGS += -I$(ERL_TOP)/lib/test_server/include \ - -I$(ERL_TOP)/lib/kernel/include EBIN = . -- cgit v1.2.3 From c642415cdcc42234c5c54cb3730cd4646b079301 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= Date: Wed, 10 Mar 2010 07:42:12 +0100 Subject: asn1 tests: No longer tolerate compilation warnings --- lib/asn1/test/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/asn1/test/Makefile') diff --git a/lib/asn1/test/Makefile b/lib/asn1/test/Makefile index 879447e816..9cf0692aa9 100644 --- a/lib/asn1/test/Makefile +++ b/lib/asn1/test/Makefile @@ -145,7 +145,7 @@ RELSYSDIR = $(RELEASE_PATH)/asn1_test # ---------------------------------------------------- # FLAGS # ---------------------------------------------------- - +ERL_COMPILE_FLAGS += +warnings_as_errors EBIN = . # ---------------------------------------------------- -- cgit v1.2.3 From 878f36c7a66e8f7459de660bf2713fb1f75c2dfb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= Date: Thu, 11 Mar 2010 11:21:55 +0100 Subject: asn1 tests: Let ts:run() build the tests Only release the source code and an Emakefile, so that ts:run() can build the tests just before running them. The main advantage of building the tests suite like that is that the turn-around time for developing new test cases are much faster: just edit the appropriate file and do ts:run(). --- lib/asn1/test/Makefile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'lib/asn1/test/Makefile') diff --git a/lib/asn1/test/Makefile b/lib/asn1/test/Makefile index 9cf0692aa9..5014eb902b 100644 --- a/lib/asn1/test/Makefile +++ b/lib/asn1/test/Makefile @@ -133,9 +133,7 @@ ERL_FILES= $(MODULES:%=%.erl) HRL_FILES= External.hrl -TARGET_FILES= $(MODULES:%=$(EBIN)/%.$(EMULATOR)) - -INSTALL_PROGS= $(TARGET_FILES) +EMAKEFILE=Emakefile # ---------------------------------------------------- # Release directory specification @@ -152,10 +150,13 @@ EBIN = . # Targets # ---------------------------------------------------- -tests debug opt: $(TARGET_FILES) $(SUITE) $(SUITE_BIN) $(SUITE_BIN_V2) +$(EMAKEFILE): $(ERL_FILES) $(HRL_FILES) + $(ERL_TOP)/make/make_emakefile $(ERL_COMPILE_FLAGS) -o$(EBIN) $(MODULES) $(ERL_FILES) >$(EMAKEFILE) + +tests debug opt: $(SUITE) $(SUITE_BIN) $(SUITE_BIN_V2) $(EMAKEFILE) clean: - rm -f $(TARGET_FILES) $(SUITE) $(SUITE_BIN) $(SUITE_BIN_V2) + rm -f $(SUITE) $(SUITE_BIN) $(SUITE_BIN_V2) rm -f core docs: @@ -188,8 +189,7 @@ release_spec: opt release_tests_spec: opt $(INSTALL_DIR) $(RELSYSDIR) - $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(RELSYSDIR) - $(INSTALL_DATA) asn1.spec $(INSTALL_PROGS) $(RELSYSDIR) + $(INSTALL_DATA) asn1.spec $(EMAKEFILE) $(ERL_FILES) $(HRL_FILES) $(RELSYSDIR) chmod -f -R u+w $(RELSYSDIR) @tar cf - *_SUITE_data | (cd $(RELSYSDIR); tar xf -) $(INSTALL_DIR) $(RELSYSDIR)/asn1_bin_SUITE_data -- cgit v1.2.3