Merge the --recompile and --reload flags (#2003)

This commit is contained in:
Ryan Dahl 2019-03-28 16:05:41 -04:00 committed by GitHub
parent 51abcd6147
commit c25e262b04
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 188 additions and 194 deletions

View file

@ -23,8 +23,8 @@ exec_time_benchmarks = [
("hello", ["tests/002_hello.ts"]),
("relative_import", ["tests/003_relative_import.ts"]),
("error_001", ["tests/error_001.ts"]),
("cold_hello", ["tests/002_hello.ts", "--recompile"]),
("cold_relative_import", ["tests/003_relative_import.ts", "--recompile"]),
("cold_hello", ["tests/002_hello.ts", "--reload"]),
("cold_relative_import", ["tests/003_relative_import.ts", "--reload"]),
]
gh_pages_data_file = "gh-pages/data.json"

View file

@ -4,6 +4,7 @@ import os
import sys
from util import mkdtemp, root_path, tests_path, run, green_ok
import shutil
import json
def fmt_test(deno_exe):
@ -18,13 +19,17 @@ def fmt_test(deno_exe):
# Set DENO_DIR to //js/ so we don't have to rely on an intenet
# connection to download https://deno.land/std/prettier/main.ts
deno_dir = os.path.join(root_path, "js")
run([deno_exe, dst, "--fmt", "--allow-read"],
merge_env={"DENO_DIR": deno_dir})
run([deno_exe, dst, "--fmt"], merge_env={"DENO_DIR": deno_dir})
with open(fixed_filename) as f:
expected = f.read()
with open(dst) as f:
actual = f.read()
assert expected == actual
if expected != actual:
print "Expected didn't match actual."
print "expected: ", json.dumps(expected)
print "actual: ", json.dumps(actual)
sys.exit(1)
finally:
shutil.rmtree(d)
print green_ok()

View file

@ -32,7 +32,7 @@ def run_unit_test2(cmd):
def run_unit_test(deno_exe, permStr, flags=None):
if flags is None:
flags = []
cmd = [deno_exe, "--reload", "js/unit_tests.ts", permStr] + flags
cmd = [deno_exe, "js/unit_tests.ts", permStr] + flags
run_unit_test2(cmd)
@ -43,7 +43,7 @@ def run_unit_test(deno_exe, permStr, flags=None):
# tests by the special string. permW0N0 means allow-write but not allow-net.
# See js/test_util.ts for more details.
def unit_tests(deno_exe):
run_unit_test(deno_exe, "permR0W0N0E0U0")
run_unit_test(deno_exe, "permR0W0N0E0U0", ["--reload"])
run_unit_test(deno_exe, "permR1W0N0E0U0", ["--allow-read"])
run_unit_test(deno_exe, "permR0W1N0E0U0", ["--allow-write"])
run_unit_test(deno_exe, "permR1W1N0E0U0",