Skip to content

Commit

Permalink
Remove tools/build.py (denoland#2865)
Browse files Browse the repository at this point in the history
Testing regression: ASAN build removed.
  • Loading branch information
ry authored Sep 7, 2019
1 parent 595b4da commit acaff6d
Show file tree
Hide file tree
Showing 24 changed files with 179 additions and 4,022 deletions.
26 changes: 1 addition & 25 deletions .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -179,20 +179,14 @@ install:
- cargo --version

before_build:
# Download clang and gn, generate ninja files.
- python tools\setup.py

# Start sccache, then throw away the S3 access key.
- ps: |-
sccache --start-server
$env:AWS_SECRET_ACCESS_KEY = $null
build_script:
# Build with Cargo first. Both builds produce a deno.exe in the same dir. We
# want the final one (which gets tested and released) to be built by Ninja.
- cargo build -vv --release --locked
- cargo clippy --all-targets --release --locked -- -D clippy::all
- python tools\build.py
- cargo build -vv --release --all-targets --locked

test_script:
- python tools\lint.py
Expand All @@ -203,24 +197,6 @@ after_test:
# Stop sccache and show stats.
- ps: sccache --stop-server

# Verify that the build is fully up-to-date. Running ninja should be a no-op.
# This catches erroneous file cleanup, and incorrectly set up build deps.
- ps: |-
$out = ninja -C $env:DENO_BUILD_PATH -n -d explain
if ($out -notcontains "ninja: no work to do.") {
throw "Build should be up-to-date but isn't."
}
# Verify that the bundled javascript and typescript files are listed
# explicitly in cli_snapshots\BUILD.gn. This is not an air-tight check.
- ps: |-
$ignore = "test_util.ts", "unit_tests.ts", "unit_test_runner.ts", "*_test.ts"
Get-ChildItem "js" -File -Force -Name |
where { $name = $_; -not ($ignore | where { $name -like $_ }) } |
where { -not (Select-String -Pattern $_ -Path cli_snapshots\BUILD.gn `
-SimpleMatch -CaseSensitive) } |
foreach { throw "$_ should be listed in cli_snapshots\BUILD.gn but isn't." }
# If this build is going to be deployed, build a zip file.
- ps: |-
if ($env:APPVEYOR_REPO_TAG -eq "true") {
Expand Down
41 changes: 4 additions & 37 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ install:
rm -rf "$RUSTUP_HOME"toolchains/*/share
before_script:
- ./tools/setup.py
# Start sccache, then throw away the S3 access key.
- |-
sccache --start-server
Expand All @@ -72,13 +71,14 @@ before_script:
script:
- ./tools/lint.py
- ./tools/test_format.py
- ./tools/build.py -C target/release
- cargo clippy --all-targets --release --locked -- -D clippy::all
- cargo build --release --locked --all-targets
- DENO_BUILD_MODE=release ./tools/test.py

jobs:
fast_finish: true
include:
- name: "gn release mac x86_64"
- name: "release mac x86_64"
os: osx
after_success:
- &gzip_release
Expand All @@ -94,7 +94,7 @@ jobs:
repo: denoland/deno
skip-cleanup: true

- name: "gn release linux x86_64"
- name: "release linux x86_64"
os: linux
after_success:
- *gzip_release
Expand All @@ -110,36 +110,3 @@ jobs:
branch: master
repo: denoland/deno
skip-cleanup: true

- name: "cargo release linux x86_64"
os: linux
script:
- ./tools/lint.py
- ./tools/test_format.py
- cargo build --release --locked
- cargo clippy --all-targets --release --locked -- -D clippy::all
- DENO_BUILD_MODE=release CARGO_TEST=1 ./tools/test.py

# LSAN: We are in the process of getting a completely clean LSAN build,
# but it will take some work. So for now we just run a subset of the
# tests. We want to detect leaks during the build process as well as
# when executing the tests. So set the ASAN_OPTIONS env var before
# build.py is run.
- name: "asan/lsan linux"
os: linux
script:
- ./tools/lint.py
- ./tools/test_format.py
- echo is_asan=true >> target/debug/args.gn
- echo is_lsan=true >> target/debug/args.gn
# TODO(ry) sccache doesn't support "-Xclang -fdebug-compilation-dir"
# Which is enabled for ASAN builds if symbol_level != 0.
# https://cs.chromium.org/chromium/src/build/config/compiler/BUILD.gn?l=1087&rcl=573da77f569b41e23527f2952938f492678ab4bb
# Ideally we can remove this constraint in the future.
- echo symbol_level=0 >> target/debug/args.gn
# Call gn gen again to make sure new args are recognized.
- third_party/depot_tools/gn gen target/debug
- export ASAN_OPTIONS=detect_leaks=1
- ./tools/build.py libdeno_test
- ./target/debug/libdeno_test

16 changes: 1 addition & 15 deletions BUILD.gn
Original file line number Diff line number Diff line change
@@ -1,20 +1,6 @@
import("//build_extra/rust/rust.gni")

group("default") {
testonly = true
deps = [
":hyper_hello",
"cli:cli_test",
"cli:deno",
"core:default",
"core/libdeno:libdeno_test",
]
}

rust_executable("hyper_hello") {
source_root = "tools/hyper_hello/hyper_hello.rs"
extern_rlib = [
"hyper",
"ring",
"core/libdeno:default",
]
}
Loading

0 comments on commit acaff6d

Please sign in to comment.