[travis] build with 4 concurrent processes

This commit is contained in:
Dane Springmeyer
2014-05-28 21:15:33 -07:00
parent be8e2ceae4
commit 99bd45a89b
2 changed files with 9 additions and 9 deletions

View File

@@ -30,9 +30,9 @@ before_script:
- if [ ${CXX} = "g++" ]; then export CXX="g++-4.8" ; fi
script:
- make llmr BUILDTYPE=${BUILDTYPE}
- make linux BUILDTYPE=${BUILDTYPE}
- make run-tests BUILDTYPE=${BUILDTYPE}
- make llmr BUILDTYPE=${BUILDTYPE} -j4
- make linux BUILDTYPE=${BUILDTYPE} -j4
- make run-tests BUILDTYPE=${BUILDTYPE} -j4
# TODO - port to linux
#- make run-headless-test BUILDTYPE=${BUILDTYPE}

View File

@@ -9,7 +9,7 @@ all: llmr
# Builds the regular library
llmr: config.gypi llmr.gyp node
deps/run_gyp llmr.gyp --depth=. -Goutput_dir=.. --generator-output=./build/llmr -f make
make -C build/llmr BUILDTYPE=$(BUILDTYPE) V=$(V) llmr-x86
$(MAKE) -C build/llmr BUILDTYPE=$(BUILDTYPE) V=$(V) llmr-x86
node:
@if [ ! `which node` ]; then echo 'error: depends on node.js. please make sure node is on your PATH'; exit 1; fi;
@@ -20,7 +20,7 @@ build/test/Makefile: src common config.gypi test/test.gyp
deps/run_gyp test/test.gyp --depth=. -Goutput_dir=.. --generator-output=./build/test -f make
test: build/test/Makefile
make -C build/test BUILDTYPE=$(BUILDTYPE) V=$(V) test
$(MAKE) -C build/test BUILDTYPE=$(BUILDTYPE) V=$(V) test
# Runs all test cases
run-tests: test
@@ -29,12 +29,12 @@ run-tests: test
done
test/%:
make -C build/test BUILDTYPE=$(BUILDTYPE) V=$(V) $*
$(MAKE) -C build/test BUILDTYPE=$(BUILDTYPE) V=$(V) $*
build/$(BUILDTYPE)/test_$*
# Only runs headless test case
run-headless-test: build/test/Makefile
make -C build/test BUILDTYPE=$(BUILDTYPE) V=$(V) headless
$(MAKE) -C build/test BUILDTYPE=$(BUILDTYPE) V=$(V) headless
build/$(BUILDTYPE)/test_headless
@@ -44,7 +44,7 @@ run-headless-test: build/test/Makefile
# Builds the linux app with make. This is also used by Travis CI
linux: config.gypi linux/llmr-app.gyp node
deps/run_gyp linux/llmr-app.gyp --depth=. -Goutput_dir=.. --generator-output=./build/linux -f make
make -C build/linux BUILDTYPE=$(BUILDTYPE) V=$(V) linuxapp
$(MAKE) -C build/linux BUILDTYPE=$(BUILDTYPE) V=$(V) linuxapp
# Executes the Linux binary
run-linux: linux
@@ -55,7 +55,7 @@ run-linux: linux
# Builds the OS X app with make.
osx: config.gypi macosx/llmr-app.gyp node
deps/run_gyp macosx/llmr-app.gyp --depth=. -Goutput_dir=.. --generator-output=./build/macosx -f make
make -C build/macosx BUILDTYPE=$(BUILDTYPE) V=$(V) osxapp
$(MAKE) -C build/macosx BUILDTYPE=$(BUILDTYPE) V=$(V) osxapp
# Executes the OS X binary
run-osx: osx