summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Dahl <ry@tinyclouds.org>2018-11-26 14:20:16 -0500
committerRyan Dahl <ry@tinyclouds.org>2018-11-27 11:33:23 -0800
commit570269b73de713afcff712977d11a3910ed849ad (patch)
tree2a505eaf6e5f16223fff5bc905ba9f1897990dc0
parenta25497fb66b3bc98caeb92b17bb9ab8754b651c2 (diff)
Don't use snapshot for src/isolate.rs tests.
-rw-r--r--libdeno/api.cc5
-rw-r--r--src/isolate.rs27
2 files changed, 10 insertions, 22 deletions
diff --git a/libdeno/api.cc b/libdeno/api.cc
index 6ee2c934f..c059bb534 100644
--- a/libdeno/api.cc
+++ b/libdeno/api.cc
@@ -36,6 +36,11 @@ Deno* deno_new(deno_buf snapshot, deno_buf shared, deno_recv_cb cb) {
v8::MaybeLocal<v8::Value>(),
v8::DeserializeInternalFieldsCallback(
deno::DeserializeInternalFields, nullptr));
+ if (!snapshot.data_ptr) {
+ // If no snapshot is provided, we initialize the context with empty
+ // main source code and source maps.
+ deno::InitializeContext(isolate, context, "", "", "");
+ }
d->context_.Reset(isolate, context);
}
diff --git a/src/isolate.rs b/src/isolate.rs
index abc5ded4d..acd40e5d8 100644
--- a/src/isolate.rs
+++ b/src/isolate.rs
@@ -393,19 +393,12 @@ fn recv_deadline<T>(
mod tests {
use super::*;
use futures;
- use snapshot;
#[test]
fn test_dispatch_sync() {
let argv = vec![String::from("./deno"), String::from("hello.js")];
let (flags, rest_argv, _) = flags::set_flags(argv).unwrap();
- // TODO Don't use deno_snapshot for these tests.
- let mut isolate = Isolate::new(
- unsafe { snapshot::deno_snapshot.clone() },
- flags,
- rest_argv,
- dispatch_sync,
- );
+ let mut isolate = Isolate::new(empty(), flags, rest_argv, dispatch_sync);
tokio_util::init(|| {
isolate
.execute(
@@ -445,13 +438,8 @@ mod tests {
fn test_metrics_sync() {
let argv = vec![String::from("./deno"), String::from("hello.js")];
let (flags, rest_argv, _) = flags::set_flags(argv).unwrap();
- // TODO Don't use deno_snapshot for these tests.
- let mut isolate = Isolate::new(
- unsafe { snapshot::deno_snapshot.clone() },
- flags,
- rest_argv,
- metrics_dispatch_sync,
- );
+ let mut isolate =
+ Isolate::new(empty(), flags, rest_argv, metrics_dispatch_sync);
tokio_util::init(|| {
// Verify that metrics have been properly initialized.
{
@@ -486,13 +474,8 @@ mod tests {
fn test_metrics_async() {
let argv = vec![String::from("./deno"), String::from("hello.js")];
let (flags, rest_argv, _) = flags::set_flags(argv).unwrap();
- // TODO Don't use deno_snapshot for these tests.
- let mut isolate = Isolate::new(
- unsafe { snapshot::deno_snapshot.clone() },
- flags,
- rest_argv,
- metrics_dispatch_async,
- );
+ let mut isolate =
+ Isolate::new(empty(), flags, rest_argv, metrics_dispatch_async);
tokio_util::init(|| {
// Verify that metrics have been properly initialized.
{