summaryrefslogtreecommitdiff
path: root/cli
diff options
context:
space:
mode:
authorLuca Casonato <lucacasonato@yahoo.com>2020-09-12 16:12:14 +0200
committerGitHub <noreply@github.com>2020-09-12 16:12:14 +0200
commitd048f58f0538d2ea7c8a418119f5092d3db719ce (patch)
treecdb517b4feab933a9c139c148ff678631d5d2474 /cli
parent95db3247485b2d1ed553c98e2231379e58a0ace2 (diff)
chore: add systemMemoryInfo unstable diagnostic (#7435)
Diffstat (limited to 'cli')
-rw-r--r--cli/diagnostics.rs1
-rw-r--r--cli/tests/integration_tests.rs2
2 files changed, 3 insertions, 0 deletions
diff --git a/cli/diagnostics.rs b/cli/diagnostics.rs
index 083c11bf5..06fc585bb 100644
--- a/cli/diagnostics.rs
+++ b/cli/diagnostics.rs
@@ -77,6 +77,7 @@ const UNSTABLE_DENO_PROPS: &[&str] = &[
"startTls",
"symlink",
"symlinkSync",
+ "systemMemoryInfo",
"transpileOnly",
"umask",
"utime",
diff --git a/cli/tests/integration_tests.rs b/cli/tests/integration_tests.rs
index ec13f7380..23c44ba89 100644
--- a/cli/tests/integration_tests.rs
+++ b/cli/tests/integration_tests.rs
@@ -444,7 +444,9 @@ fn upgrade_with_space_in_path() {
}
// Warning: this test requires internet access.
+// TODO(#7412): reenable. test is flaky
#[test]
+#[ignore]
fn upgrade_with_version_in_tmpdir() {
let temp_dir = TempDir::new().unwrap();
let exe_path = temp_dir.path().join("deno");