From 1bfb44336914a775cd01120165517394d30aec23 Mon Sep 17 00:00:00 2001 From: Ryan Dahl Date: Tue, 16 Apr 2019 15:13:42 -0400 Subject: Implement async module loading in CLI (#2084) --- tests/026_workers.ts | 4 ++-- tests/circular1.js | 2 +- tests/circular2.js | 2 +- tests/error_009_missing_js_module.disabled | 4 ++++ tests/error_009_missing_js_module.test | 4 ---- tests/error_010_nonexistent_arg.disabled | 4 ++++ tests/error_010_nonexistent_arg.test | 4 ---- tests/import_meta.ts | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) create mode 100644 tests/error_009_missing_js_module.disabled delete mode 100644 tests/error_009_missing_js_module.test create mode 100644 tests/error_010_nonexistent_arg.disabled delete mode 100644 tests/error_010_nonexistent_arg.test (limited to 'tests') diff --git a/tests/026_workers.ts b/tests/026_workers.ts index 0cf8f53b1..a7deee217 100644 --- a/tests/026_workers.ts +++ b/tests/026_workers.ts @@ -1,5 +1,5 @@ -const jsWorker = new Worker("tests/subdir/test_worker.js"); -const tsWorker = new Worker("tests/subdir/test_worker.ts"); +const jsWorker = new Worker("./tests/subdir/test_worker.js"); +const tsWorker = new Worker("./tests/subdir/test_worker.ts"); tsWorker.onmessage = e => { console.log("Received ts: " + e.data); diff --git a/tests/circular1.js b/tests/circular1.js index b166f7e5d..8b2cc4960 100644 --- a/tests/circular1.js +++ b/tests/circular1.js @@ -1,2 +1,2 @@ -import "circular2.js"; +import "./circular2.js"; console.log("circular1"); diff --git a/tests/circular2.js b/tests/circular2.js index 3d3136a0d..62127e04d 100644 --- a/tests/circular2.js +++ b/tests/circular2.js @@ -1,2 +1,2 @@ -import "circular1.js"; +import "./circular1.js"; console.log("circular2"); diff --git a/tests/error_009_missing_js_module.disabled b/tests/error_009_missing_js_module.disabled new file mode 100644 index 000000000..b16bb232b --- /dev/null +++ b/tests/error_009_missing_js_module.disabled @@ -0,0 +1,4 @@ +args: tests/error_009_missing_js_module.js +check_stderr: true +exit_code: 1 +output: tests/error_009_missing_js_module.js.out \ No newline at end of file diff --git a/tests/error_009_missing_js_module.test b/tests/error_009_missing_js_module.test deleted file mode 100644 index b16bb232b..000000000 --- a/tests/error_009_missing_js_module.test +++ /dev/null @@ -1,4 +0,0 @@ -args: tests/error_009_missing_js_module.js -check_stderr: true -exit_code: 1 -output: tests/error_009_missing_js_module.js.out \ No newline at end of file diff --git a/tests/error_010_nonexistent_arg.disabled b/tests/error_010_nonexistent_arg.disabled new file mode 100644 index 000000000..9d183107c --- /dev/null +++ b/tests/error_010_nonexistent_arg.disabled @@ -0,0 +1,4 @@ +args: not-a-valid-filename.ts +output: tests/error_010_nonexistent_arg.out +exit_code: 1 +check_stderr: true diff --git a/tests/error_010_nonexistent_arg.test b/tests/error_010_nonexistent_arg.test deleted file mode 100644 index 9d183107c..000000000 --- a/tests/error_010_nonexistent_arg.test +++ /dev/null @@ -1,4 +0,0 @@ -args: not-a-valid-filename.ts -output: tests/error_010_nonexistent_arg.out -exit_code: 1 -check_stderr: true diff --git a/tests/import_meta.ts b/tests/import_meta.ts index 2f3bec9ed..d111059ea 100644 --- a/tests/import_meta.ts +++ b/tests/import_meta.ts @@ -1,3 +1,3 @@ console.log("import_meta", import.meta.url, import.meta.main); -import "import_meta2.ts"; +import "./import_meta2.ts"; -- cgit v1.2.3