From 1033f6c8cb7573219bb4265102b1ad380a395b69 Mon Sep 17 00:00:00 2001 From: DeeDeeG Date: Mon, 19 Apr 2021 09:27:22 -0400 Subject: [PATCH] tools: add _depot_tools to PATH (for V8 tests) Ensures the `_depot_tools` dir bootstrapped during this script is added to the PATH, before `ninja` is executed, as `_depot_tools` already has a copy of `ninja` in it. This means one less system requirement to be able to run this script. (It seems like this was already intended to be on the PATH?) Note: This script is used by the `test-v8` Makefile target. PR-URL: https://github.com/nodejs/node/pull/38299 Reviewed-By: Richard Lau Reviewed-By: James M Snell --- tools/make-v8.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/make-v8.sh b/tools/make-v8.sh index 5a23432b589001..79ab02af275aa9 100755 --- a/tools/make-v8.sh +++ b/tools/make-v8.sh @@ -36,7 +36,8 @@ if [ "$ARCH" = "s390x" ] || [ "$ARCH" = "ppc64le" ]; then gn gen -v "out.gn/$BUILD_ARCH_TYPE" --args="is_component_build=false is_debug=false use_goma=false goma_dir=\"None\" use_custom_libcxx=false v8_target_cpu=\"$TARGET_ARCH\" target_cpu=\"$TARGET_ARCH\" v8_enable_backtrace=true" ninja -v -C "out.gn/$BUILD_ARCH_TYPE" d8 cctest inspector-test else + DEPOT_TOOLS_DIR="$(cd _depot_tools && pwd)" # shellcheck disable=SC2086 - PATH=~/_depot_tools:$PATH tools/dev/v8gen.py "$BUILD_ARCH_TYPE" --no-goma $V8_BUILD_OPTIONS - PATH=~/_depot_tools:$PATH ninja -C "out.gn/$BUILD_ARCH_TYPE/" d8 cctest inspector-test + PATH="$DEPOT_TOOLS_DIR":$PATH tools/dev/v8gen.py "$BUILD_ARCH_TYPE" --no-goma $V8_BUILD_OPTIONS + PATH="$DEPOT_TOOLS_DIR":$PATH ninja -C "out.gn/$BUILD_ARCH_TYPE/" d8 cctest inspector-test fi