foster/denoland-deno
1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2025-01-08 15:19:40 -05:00
Code Issues Packages 1 Wiki Activity

build: remove absolute path

Browse source
This commit is contained in:
Bert Belder 2018-11-01 13:05:21 +01:00
parent 9aa3640711
commit b73b651612
No known key found for this signature in database
GPG key ID: 7A77887B2E2ED461
3 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.appveyor.yml
View file

@ -381,11 +381,7 @@ after_test:
Select-String $trap -Path $files -SimpleMatch | where { Select-String $trap -Path $files -SimpleMatch | where {
# V8 took the liberty to produce an absolute path in their ninja # V8 took the liberty to produce an absolute path in their ninja
# output. We can't do much about that, so we just ignore it. # output. We can't do much about that, so we just ignore it.
$_.Line -notmatch "v8/builtins-generated/bytecodes-builtins-list.h" -and $_.Line -notmatch "v8/builtins-generated/bytecodes-builtins-list.h"
# The absolute path to snapshot_libdeno_test.bin is passed to test_cc
# via pre-processor variable. It's absolute because we want to be able
# to execute test_cc from both the project root and the build root.
$_.Line -notmatch "snapshot_libdeno_test.bin"
} | tee -Variable line_matches } | tee -Variable line_matches
if ($line_matches) { if ($line_matches) {
$ctx = $line_matches.Line | $ctx = $line_matches.Line |

4
BUILD.gn
View file

@ -197,8 +197,8 @@ v8_executable("test_cc") {
data = [ data = [
"$target_gen_dir/snapshot_libdeno_test.bin", "$target_gen_dir/snapshot_libdeno_test.bin",
] ]
snapshot_abs_path = rebase_path(data[0]) snapshot_path = rebase_path(data[0], root_build_dir)
defines = [ "SNAPSHOT_PATH=\"$snapshot_abs_path\"" ] defines = [ "SNAPSHOT_PATH=\"$snapshot_path\"" ]
configs = [ ":deno_config" ] configs = [ ":deno_config" ]
} }

12
libdeno/test.cc
View file

@ -5,10 +5,18 @@
deno_buf snapshot = {nullptr, 0, nullptr, 0}; deno_buf snapshot = {nullptr, 0, nullptr, 0};
int main(int argc, char** argv) { int main(int argc, char** argv) {
// Locate the snapshot.
std::string exe_path;
if (!deno::ExePath(&exe_path)) {
std::cerr << "deno::ExePath() failed" << std::endl;
return 1;
}
std::string snapshot_path = deno::Dirname(exe_path) + SNAPSHOT_PATH;
// Load the snapshot. // Load the snapshot.
std::string contents; std::string contents;
if (!deno::ReadFileToString(SNAPSHOT_PATH, &contents)) { if (!deno::ReadFileToString(snapshot_path.c_str(), &contents)) {
printf("Failed to read file %s\n", SNAPSHOT_PATH); std::cerr << "Failed to read snapshot from " << snapshot_path << std::endl;
return 1; return 1;
} }
snapshot.data_ptr = snapshot.data_ptr =