diff options
Diffstat (limited to 'cli/bench')
| -rw-r--r-- | cli/bench/main.rs | 41 | ||||
| -rw-r--r-- | cli/bench/throughput.rs | 10 |
2 files changed, 32 insertions, 19 deletions
diff --git a/cli/bench/main.rs b/cli/bench/main.rs index e6d735397..06e2d59bb 100644 --- a/cli/bench/main.rs +++ b/cli/bench/main.rs @@ -36,29 +36,46 @@ const EXEC_TIME_BENCHMARKS: &[(&str, &[&str], Option<i32>)] = &[ // invalidating that cache. ( "cold_hello", - &["run", "--reload", "cli/tests/002_hello.ts"], + &["run", "--reload", "cli/tests/testdata/002_hello.ts"], None, ), ( "cold_relative_import", - &["run", "--reload", "cli/tests/003_relative_import.ts"], + &[ + "run", + "--reload", + "cli/tests/testdata/003_relative_import.ts", + ], None, ), - ("hello", &["run", "cli/tests/002_hello.ts"], None), + ("hello", &["run", "cli/tests/testdata/002_hello.ts"], None), ( "relative_import", - &["run", "cli/tests/003_relative_import.ts"], + &["run", "cli/tests/testdata/003_relative_import.ts"], None, ), - ("error_001", &["run", "cli/tests/error_001.ts"], Some(1)), + ( + "error_001", + &["run", "cli/tests/testdata/error_001.ts"], + Some(1), + ), ( "no_check_hello", - &["run", "--reload", "--no-check", "cli/tests/002_hello.ts"], + &[ + "run", + "--reload", + "--no-check", + "cli/tests/testdata/002_hello.ts", + ], None, ), ( "workers_startup", - &["run", "--allow-read", "cli/tests/workers/bench_startup.ts"], + &[ + "run", + "--allow-read", + "cli/tests/testdata/workers/bench_startup.ts", + ], None, ), ( @@ -66,7 +83,7 @@ const EXEC_TIME_BENCHMARKS: &[(&str, &[&str], Option<i32>)] = &[ &[ "run", "--allow-read", - "cli/tests/workers/bench_round_robin.ts", + "cli/tests/testdata/workers/bench_round_robin.ts", ], None, ), @@ -75,23 +92,23 @@ const EXEC_TIME_BENCHMARKS: &[(&str, &[&str], Option<i32>)] = &[ &[ "run", "--allow-read", - "cli/tests/workers/bench_large_message.ts", + "cli/tests/testdata/workers/bench_large_message.ts", ], None, ), ( "text_decoder", - &["run", "cli/tests/text_decoder_perf.js"], + &["run", "cli/tests/testdata/text_decoder_perf.js"], None, ), ( "text_encoder", - &["run", "cli/tests/text_encoder_perf.js"], + &["run", "cli/tests/testdata/text_encoder_perf.js"], None, ), ( "text_encoder_into", - &["run", "cli/tests/text_encoder_into_perf.js"], + &["run", "cli/tests/testdata/text_encoder_into_perf.js"], None, ), ( diff --git a/cli/bench/throughput.rs b/cli/bench/throughput.rs index de18089bb..0420889ef 100644 --- a/cli/bench/throughput.rs +++ b/cli/bench/throughput.rs @@ -14,7 +14,7 @@ const CLIENT_ADDR: &str = "127.0.0.1 4544"; pub(crate) fn cat(deno_exe: &Path, megs: usize) -> f64 { let size = megs * MB; let shell_cmd = format!( - "{} run --allow-read cli/tests/cat.ts /dev/zero | head -c {}", + "{} run --allow-read cli/tests/testdata/cat.ts /dev/zero | head -c {}", deno_exe.to_str().unwrap(), size ); @@ -47,12 +47,8 @@ pub(crate) fn tcp(deno_exe: &Path, megs: usize) -> Result<f64> { // Run deno echo server in the background. let mut echo_server = Command::new(deno_exe.to_str().unwrap()) - .args(&[ - "run", - "--allow-net", - "cli/tests/echo_server.ts", - SERVER_ADDR, - ]) + .args(&["run", "--allow-net", "echo_server.ts", SERVER_ADDR]) + .current_dir(test_util::testdata_path()) .spawn()?; std::thread::sleep(Duration::from_secs(5)); // wait for deno to wake up. TODO racy. |