Browse Source

Use cowlib master in tests

The old Cowlib's Erlang.mk does not work on Windows.
Loïc Hoguin 6 years ago
parent
commit
8b2c6621d1
2 changed files with 3 additions and 1 deletions
  1. 1 0
      test/core_app.mk
  2. 2 1
      test/core_apps.mk

+ 1 - 0
test/core_app.mk

@@ -2410,6 +2410,7 @@ core-app-hrl-deps: init
 	$t $(MAKE) -C $(APP) new-lib in=my_app $v
 	$t $(MAKE) -C $(APP) new-lib in=my_app $v
 
 
 	$t echo "DEPS = cowlib" > $(APP)/apps/my_app/Makefile
 	$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 "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(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
 	$t printf "%s\n" "-module(girl)." > $(APP)/apps/my_app/src/girl.erl

+ 2 - 1
test/core_apps.mk

@@ -18,6 +18,7 @@ core-apps-build: init
 	$t mkdir -p $(APP)/apps/my_app/src/
 	$t mkdir -p $(APP)/apps/my_app/src/
 	$t touch $(APP)/apps/file.erl
 	$t touch $(APP)/apps/file.erl
 	$t echo "DEPS = cowlib" > $(APP)/apps/my_app/Makefile
 	$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 "include ../../erlang.mk" >> $(APP)/apps/my_app/Makefile
 	$t echo "-module(boy)." > $(APP)/apps/my_app/src/boy.erl
 	$t echo "-module(boy)." > $(APP)/apps/my_app/src/boy.erl
 	$t echo "-module(girl)." > $(APP)/apps/my_app/src/girl.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
 	$t $(MAKE) -C $(APP) new t=gen_server n=my_server in=my_app $v
 
 
 	$i "Add Cowlib to the list of dependencies"
 	$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"
 	$i "Build the application"
 	$t $(MAKE) -C $(APP) $v
 	$t $(MAKE) -C $(APP) $v