From 8b2c6621d1c08a5bcb0c87a4c11c4ad95e7a0f48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Hoguin?= Date: Mon, 24 Jun 2019 10:48:54 +0200 Subject: Use cowlib master in tests The old Cowlib's Erlang.mk does not work on Windows. --- test/core_app.mk | 1 + test/core_apps.mk | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/test/core_app.mk b/test/core_app.mk index 77df7ea..9c30efe 100644 --- a/test/core_app.mk +++ b/test/core_app.mk @@ -2410,6 +2410,7 @@ core-app-hrl-deps: init $t $(MAKE) -C $(APP) new-lib in=my_app $v $t echo "DEPS = cowlib" > $(APP)/apps/my_app/Makefile + $t echo "dep_cowlib_commit = master" >> $(APP)/apps/my_app/Makefile $t echo "include ../../erlang.mk" >> $(APP)/apps/my_app/Makefile $t printf "%s\n" "-module(boy)." "-include_lib(\"cowlib/include/cow_inline.hrl\")." > $(APP)/apps/my_app/src/boy.erl $t printf "%s\n" "-module(girl)." > $(APP)/apps/my_app/src/girl.erl diff --git a/test/core_apps.mk b/test/core_apps.mk index 47040d0..878bb10 100644 --- a/test/core_apps.mk +++ b/test/core_apps.mk @@ -18,6 +18,7 @@ core-apps-build: init $t mkdir -p $(APP)/apps/my_app/src/ $t touch $(APP)/apps/file.erl $t echo "DEPS = cowlib" > $(APP)/apps/my_app/Makefile + $t echo "dep_cowlib_commit = master" >> $(APP)/apps/my_app/Makefile $t echo "include ../../erlang.mk" >> $(APP)/apps/my_app/Makefile $t echo "-module(boy)." > $(APP)/apps/my_app/src/boy.erl $t echo "-module(girl)." > $(APP)/apps/my_app/src/girl.erl @@ -550,7 +551,7 @@ core-apps-only: init $t $(MAKE) -C $(APP) new t=gen_server n=my_server in=my_app $v $i "Add Cowlib to the list of dependencies" - $t perl -ni.bak -e 'print;if ($$.==1) {print "DEPS = cowlib\n"}' $(APP)/apps/my_app/Makefile + $t perl -ni.bak -e 'print;if ($$.==1) {print "DEPS = cowlib\ndep_cowlib_commit = master\n"}' $(APP)/apps/my_app/Makefile $i "Build the application" $t $(MAKE) -C $(APP) $v -- cgit v1.2.3