From 4b13eb4bc64d7f04291fcb62ee4794a672d8d3b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Hoguin?= Date: Mon, 3 Jun 2013 17:18:19 +0200 Subject: Add create_static_dir/1 and delete_static_dir/1 --- README.md | 23 +++++++++++++++++++++++ erlang.mk | 43 +++++++++++++++++++++++++++++++++++-------- src/ct_helper.erl | 22 ++++++++++++++++++++++ 3 files changed, 80 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index c67e570..58a68a9 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,29 @@ ct_helper Helper modules for common_test suites. +Creating temporary static files +------------------------------- + +This library includes a function that will generate files tailored +for testing web servers. The following snippet will create a +directory containing all the files and subsequently delete it all. + +``` erlang +ct_helper:create_static_dir(Path), +%% do things! +ct_helper:delete_static_dir(Path). +``` + +The following files are created. Replace `./` with the `Path` passed +as argument to find the real path of the files. + + * ./ + * ./directory/ + * ./unknown + * ./style.css + * ./index.html + * ./unreadable (mode 0333) + Generating SSL certificates --------------------------- diff --git a/erlang.mk b/erlang.mk index 0ac0f3f..8df7ee2 100644 --- a/erlang.mk +++ b/erlang.mk @@ -19,9 +19,12 @@ V ?= 0 appsrc_verbose_0 = @echo " APP " $(PROJECT).app.src; appsrc_verbose = $(appsrc_verbose_$(V)) -erlc_verbose_0 = @echo " ERLC " $(?F); +erlc_verbose_0 = @echo " ERLC " $(filter-out %.dtl,$(?F)); erlc_verbose = $(erlc_verbose_$(V)) +dtl_verbose_0 = @echo " DTL " $(filter %.dtl,$(?F)); +dtl_verbose = $(dtl_verbose_$(V)) + gen_verbose_0 = @echo " GEN " $@; gen_verbose = $(gen_verbose_$(V)) @@ -34,6 +37,7 @@ DEPS_DIR ?= $(CURDIR)/deps export DEPS_DIR ALL_DEPS_DIRS = $(addprefix $(DEPS_DIR)/,$(DEPS)) +ALL_TEST_DEPS_DIRS = $(addprefix $(DEPS_DIR)/,$(TEST_DEPS)) # Application. @@ -47,17 +51,35 @@ all: deps app clean-all: clean clean-deps clean-docs $(gen_verbose) rm -rf .$(PROJECT).plt $(DEPS_DIR) logs -MODULES = $(shell ls src/*.erl | sed 's/src\///;s/\.erl/,/' | sed '$$s/.$$//') - app: ebin/$(PROJECT).app + $(eval MODULES := $(shell ls ebin/*.beam \ + | sed 's/ebin\///;s/\.beam/,/' | sed '$$s/.$$//')) $(appsrc_verbose) cat src/$(PROJECT).app.src \ | sed 's/{modules, \[\]}/{modules, \[$(MODULES)\]}/' \ > ebin/$(PROJECT).app -ebin/$(PROJECT).app: src/*.erl - @mkdir -p ebin/ +define compile_erl = $(erlc_verbose) ERL_LIBS=deps erlc -v $(ERLC_OPTS) -o ebin/ -pa ebin/ \ - $(COMPILE_FIRST_PATHS) $? + $(COMPILE_FIRST_PATHS) $(1) +endef + +define compile_dtl = + $(dtl_verbose) erl -noshell -pa ebin/ deps/erlydtl/ebin/ -eval ' \ + Compile = fun(F) -> \ + Module = list_to_atom( \ + string:to_lower(filename:basename(F, ".dtl")) ++ "_dtl"), \ + erlydtl_compiler:compile(F, Module, [{out_dir, "ebin/"}]) \ + end, \ + _ = [Compile(F) || F <- string:tokens("$(1)", " ")], \ + init:stop()' +endef + +ebin/$(PROJECT).app: src/*.erl $(wildcard src/*.core) $(wildcard templates/*.dtl) + @mkdir -p ebin/ + $(if $(strip $(filter-out %.dtl,$?)), \ + $(call compile_erl,$(filter-out %.dtl,$?))) + $(if $(strip $(filter %.dtl,$?)), \ + $(call compile_dtl,$(filter %.dtl,$?))) clean: $(gen_verbose) rm -rf ebin/ test/*.beam erl_crash.dump @@ -94,7 +116,12 @@ clean-docs: # Tests. -build-tests: +$(foreach dep,$(TEST_DEPS),$(eval $(call dep_target,$(dep)))) + +build-test-deps: $(ALL_TEST_DEPS_DIRS) + @for dep in $(ALL_TEST_DEPS_DIRS) ; do $(MAKE) -C $$dep; done + +build-tests: build-test-deps $(gen_verbose) erlc -v $(ERLC_OPTS) -o test/ \ $(wildcard test/*.erl test/*/*.erl) -pa ebin/ @@ -110,7 +137,7 @@ CT_SUITES ?= CT_SUITES_FULL = $(addsuffix _SUITE,$(CT_SUITES)) tests: ERLC_OPTS += -DTEST=1 +'{parse_transform, eunit_autoexport}' -tests: clean clean-deps deps app build-tests +tests: clean deps app build-tests @mkdir -p logs/ @$(CT_RUN) -suite $(CT_SUITES_FULL) $(gen_verbose) rm -f test/*.beam diff --git a/src/ct_helper.erl b/src/ct_helper.erl index d572d68..2092d8b 100644 --- a/src/ct_helper.erl +++ b/src/ct_helper.erl @@ -15,12 +15,34 @@ %% @doc Helper functions for common_test suites. -module(ct_helper). +-export([create_static_dir/1]). +-export([delete_static_dir/1]). -export([make_certs/0]). -type der_encoded() :: binary(). -type key() :: {'RSAPrivateKey' | 'DSAPrivateKey' | 'PrivateKeyInfo', der_encoded()}. +create_static_dir(Path) -> + ok = file:make_dir(Path), + ok = file:make_dir(Path ++ "/directory"), + ok = file:write_file(Path ++ "/unknown", "File with no extension.\n"), + ok = file:write_file(Path ++ "/style.css", "body{color:red}\n"), + ok = file:write_file(Path ++ "/index.html", + "Hello!\n"), + ok = file:write_file(Path ++ "/unreadable", "unreadable\n"), + ok = file:change_mode(Path ++ "/unreadable", 8#0333), + ok. + +delete_static_dir(Path) -> + ok = file:delete(Path ++ "/unreadable"), + ok = file:delete(Path ++ "/index.html"), + ok = file:delete(Path ++ "/style.css"), + ok = file:delete(Path ++ "/unknown"), + ok = file:del_dir(Path ++ "/directory"), + ok = file:del_dir(Path), + ok. + %% @doc Create a set of certificates. -spec make_certs() -> {CaCert::der_encoded(), Cert::der_encoded(), Key::key()}. -- cgit v1.2.3