From 24c0141bea1e82818c94ac7703a71197e63305bb Mon Sep 17 00:00:00 2001 From: Matt McCormick Date: Sat, 16 Jul 2016 13:55:04 -0400 Subject: [PATCH] ci: Fix make *.test invocation --- Makefile | 1 + circle.yml | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index 2fb7019..38cd69f 100644 --- a/Makefile +++ b/Makefile @@ -89,6 +89,7 @@ base: Dockerfile $(DOCKER) build -t $(ORG)/base . base.test: base test/run.py + mkdir -p $(BIN) $(DOCKER) run --rm dockcross/base > $(BIN)/dockcross-base && chmod +x $(BIN)/dockcross-base $(BIN)/dockcross-base python test/run.py --emulator 'sh -c' diff --git a/circle.yml b/circle.yml index 8fcce1c..71f6714 100644 --- a/circle.yml +++ b/circle.yml @@ -24,19 +24,19 @@ dependencies: test: override: - - make base/test - - make android-arm/test - - make browser-asmjs/test - - make linux-arm64/test - - make linux-armv5/test - - make linux-armv6/test - - make linux-armv7/test - - make linux-ppc64le/test - - make linux-x64/test - - make linux-x86/test - - make windows-x64/test: + - make base.test + - make android-arm.test + - make browser-asmjs.test + - make linux-arm64.test + - make linux-armv5.test + - make linux-armv6.test + - make linux-armv7.test + - make linux-ppc64le.test + - make linux-x64.test + - make linux-x86.test + - make windows-x64.test: timeout: 3000 - - make windows-x86/test: + - make windows-x86.test: timeout: 3000 deployment: