diff options
| author | Peter Andersson <[email protected]> | 2010-06-07 17:28:01 +0200 |
|---|---|---|
| committer | Raimo Niskanen <[email protected]> | 2010-06-09 16:19:25 +0200 |
| commit | 2dbeff631ce93744972cb04039d434aa172d28f4 (patch) | |
| tree | 23b1ddfd4a41658cf3e9592f14b132111cfe8a47 /lib/common_test/test/Makefile | |
| parent | 4ed31623e145531a1aa84f6c1091481820f62099 (diff) | |
| download | otp-2dbeff631ce93744972cb04039d434aa172d28f4.tar.gz otp-2dbeff631ce93744972cb04039d434aa172d28f4.tar.bz2 otp-2dbeff631ce93744972cb04039d434aa172d28f4.zip | |
Fix so that ct_run converts relative diretories in the code path to absolute
Directories added with run_test -pa or -pz in the pre erl_args part of the command line will be converted from relative to absolute, this to avoid confusion when Common Test switches working directory during the test run.
Also fixed in this commit: Problem with timeouts during init_tc or end_tc (in the Test Server framework).
Diffstat (limited to 'lib/common_test/test/Makefile')
| -rw-r--r-- | lib/common_test/test/Makefile | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/common_test/test/Makefile b/lib/common_test/test/Makefile index 2f1ff9a835..97ded5eb9a 100644 --- a/lib/common_test/test/Makefile +++ b/lib/common_test/test/Makefile @@ -65,18 +65,18 @@ EBIN = . # Targets # ---------------------------------------------------- -.PHONY: make_emakefile +#.PHONY: make_emakefile -make_emakefile: - $(ERL_TOP)/make/make_emakefile $(ERL_COMPILE_FLAGS) -o$(EBIN) $(MODULES)\ - > $(EMAKEFILE) +#make_emakefile: +# $(ERL_TOP)/make/make_emakefile $(ERL_COMPILE_FLAGS) -o$(EBIN) $(MODULES)\ +# > $(EMAKEFILE) -tests debug opt: make_emakefile +tests debug opt: erl $(ERL_MAKE_FLAGS) -make clean: - rm -f $(EMAKEFILE) rm -f $(TARGET_FILES) +# rm -f $(EMAKEFILE) rm -f core docs: @@ -88,7 +88,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt -release_tests_spec: make_emakefile +release_tests_spec: $(INSTALL_DIR) $(RELSYSDIR) $(INSTALL_DATA) $(ERL_FILES) $(COVERFILE) $(RELSYSDIR) $(INSTALL_PROGRAM) common_test.spec $(RELSYSDIR) |