aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorBen Noordhuis <info@bnoordhuis.nl>2013-10-23 13:42:53 +0200
committerBen Noordhuis <info@bnoordhuis.nl>2013-10-24 16:31:31 +0200
commit808a968409b6c6cc305506efd3caa4477a376125 (patch)
tree0f8ca9e4abb65ed3593bfd4aaa5fc1d698ebafd7 /Makefile
parenteb291de00e6ec5c75d3c27d40403d3a842305d01 (diff)
downloadandroid-node-v8-808a968409b6c6cc305506efd3caa4477a376125.tar.gz
android-node-v8-808a968409b6c6cc305506efd3caa4477a376125.tar.bz2
android-node-v8-808a968409b6c6cc305506efd3caa4477a376125.zip
build: fix test-gc weakref build rule
Make the build rule depend on the build artifact (weakref.node) itself rather than the directory it's built in. Depending on the directory means that a build failure won't trigger a rebuild on the next invocation because the directory's timestamp has been updated. This is a back-port of commit 1189571 from the master branch that hopefully fixes the following CI error: executing: make test/gc/node_modules/weak/build/ make: *** No rule to make target `test/gc/node_modules/weak/build/'. Command exited with non-zero: make test/gc/node_modules/weak/build/ Build step 'Execute NodeJS script' marked build as failure
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 01c689db53..14aeca3b8a 100644
--- a/Makefile
+++ b/Makefile
@@ -82,16 +82,16 @@ test-http1: all
test-valgrind: all
$(PYTHON) tools/test.py --mode=release --valgrind simple message
-test/gc/node_modules/weak/build:
+test/gc/node_modules/weak/build/Release/weakref.node:
@if [ ! -f node ]; then make all; fi
./node deps/npm/node_modules/node-gyp/bin/node-gyp rebuild \
--directory="$(shell pwd)/test/gc/node_modules/weak" \
--nodedir="$(shell pwd)"
-test-gc: all test/gc/node_modules/weak/build
+test-gc: all test/gc/node_modules/weak/build/Release/weakref.node
$(PYTHON) tools/test.py --mode=release gc
-test-all: all test/gc/node_modules/weak/build
+test-all: all test/gc/node_modules/weak/build/Release/weakref.node
$(PYTHON) tools/test.py --mode=debug,release
make test-npm