From 0071dfdc5ced9a717c7b5008e20bf79f1b6dc78a Mon Sep 17 00:00:00 2001 From: Trivikram Kamat <16024985+trivikr@users.noreply.github.com> Date: Mon, 31 Aug 2020 08:48:58 -0700 Subject: update actions to run on ubuntu-18.04 (#7160) --- cli/bench/throughput.rs | 12 +++++++++++- cli/tests/echo_server.ts | 2 +- 2 files changed, 12 insertions(+), 2 deletions(-) (limited to 'cli') diff --git a/cli/bench/throughput.rs b/cli/bench/throughput.rs index 0be46f142..74844fbed 100644 --- a/cli/bench/throughput.rs +++ b/cli/bench/throughput.rs @@ -34,7 +34,17 @@ pub(crate) fn cat(deno_exe: &PathBuf, megs: usize) -> Result { pub(crate) fn tcp(deno_exe: &PathBuf, megs: usize) -> Result { let size = megs * MB; - let shell_cmd = format!("head -c {} /dev/zero | nc {}", size, CLIENT_ADDR); + // The GNU flavor of `nc` requires the `-N` flag to shutdown the network socket after EOF on stdin + let nc_command = if cfg!(target_os = "linux") { + "nc -N" + } else { + "nc" + }; + + let shell_cmd = format!( + "head -c {} /dev/zero | {} {}", + size, nc_command, CLIENT_ADDR + ); println!("{}", shell_cmd); let cmd = &["sh", "-c", &shell_cmd]; diff --git a/cli/tests/echo_server.ts b/cli/tests/echo_server.ts index 053bdf5c1..fc8afa981 100644 --- a/cli/tests/echo_server.ts +++ b/cli/tests/echo_server.ts @@ -4,7 +4,7 @@ const listener = Deno.listen({ hostname, port: Number(port) }); console.log("listening on", addr); listener.accept().then( async (conn): Promise => { - await Deno.copy(conn, conn); + console.log("recieved bytes:", await Deno.copy(conn, conn)); conn.close(); listener.close(); }, -- cgit v1.2.3