Bensuperpc/dockcross
1
0
Fork 0
mirror of https://github.com/bensuperpc/dockcross.git synced 2024-12-23 09:04:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16 from thewtex/circleci-test-commands

Browse Source 
ci: Fix make *.test invocation
This commit is contained in:
Matt McCormick 2016-07-16 17:39:32 -04:00 committed by GitHub
commit ae9d28a177
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@ -89,6 +89,7 @@ base: Dockerfile
$(DOCKER) build -t $(ORG)/base . $(DOCKER) build -t $(ORG)/base .
base.test: base test/run.py base.test: base test/run.py
mkdir -p $(BIN)
$(DOCKER) run --rm dockcross/base > $(BIN)/dockcross-base && chmod +x $(BIN)/dockcross-base $(DOCKER) run --rm dockcross/base > $(BIN)/dockcross-base && chmod +x $(BIN)/dockcross-base
$(BIN)/dockcross-base python test/run.py --emulator 'sh -c' $(BIN)/dockcross-base python test/run.py --emulator 'sh -c'

24
circle.yml
View File

@ -24,19 +24,19 @@ dependencies:
test: test:
override: override:
- make base/test - make base.test
- make android-arm/test - make android-arm.test
- make browser-asmjs/test - make browser-asmjs.test
- make linux-arm64/test - make linux-arm64.test
- make linux-armv5/test - make linux-armv5.test
- make linux-armv6/test - make linux-armv6.test
- make linux-armv7/test - make linux-armv7.test
- make linux-ppc64le/test - make linux-ppc64le.test
- make linux-x64/test - make linux-x64.test
- make linux-x86/test - make linux-x86.test
- make windows-x64/test: - make windows-x64.test:
timeout: 3000 timeout: 3000
- make windows-x86/test: - make windows-x86.test:
timeout: 3000 timeout: 3000
deployment: deployment: