diff --git a/Cargo.toml b/Cargo.toml index a4b903e5734..8545502cea0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [workspace] members = ["src/clippy-tracing", "src/cpu-template-helper", "src/firecracker", "src/jailer", "src/log-instrument", "src/log-instrument-macros", "src/rebase-snap", "src/seccompiler", "src/snapshot-editor"] -default-members = ["src/firecracker"] +default-members = ["src/clippy-tracing", "src/cpu-template-helper", "src/firecracker", "src/rebase-snap", "src/seccompiler", "src/snapshot-editor"] resolver = "2" [profile.dev] diff --git a/src/log-instrument/Cargo.toml b/src/log-instrument/Cargo.toml index 8536d7c383b..db50d1e1eb9 100644 --- a/src/log-instrument/Cargo.toml +++ b/src/log-instrument/Cargo.toml @@ -9,29 +9,23 @@ license = "Apache-2.0" [lib] bench = false -[[bin]] +[[example]] name = "one" -bench = false -[[bin]] +[[example]] name = "two" -bench = false -[[bin]] +[[example]] name = "three" -bench = false -[[bin]] +[[example]] name = "four" -bench = false -[[bin]] +[[example]] name = "five" -bench = false -[[bin]] +[[example]] name = "six" -bench = false [dependencies] env_logger = "0.10.0" diff --git a/src/log-instrument/src/bin/five.rs b/src/log-instrument/examples/five.rs similarity index 100% rename from src/log-instrument/src/bin/five.rs rename to src/log-instrument/examples/five.rs diff --git a/src/log-instrument/src/bin/four.rs b/src/log-instrument/examples/four.rs similarity index 100% rename from src/log-instrument/src/bin/four.rs rename to src/log-instrument/examples/four.rs diff --git a/src/log-instrument/src/bin/one.rs b/src/log-instrument/examples/one.rs similarity index 100% rename from src/log-instrument/src/bin/one.rs rename to src/log-instrument/examples/one.rs diff --git a/src/log-instrument/src/bin/six.rs b/src/log-instrument/examples/six.rs similarity index 100% rename from src/log-instrument/src/bin/six.rs rename to src/log-instrument/examples/six.rs diff --git a/src/log-instrument/src/bin/three.rs b/src/log-instrument/examples/three.rs similarity index 100% rename from src/log-instrument/src/bin/three.rs rename to src/log-instrument/examples/three.rs diff --git a/src/log-instrument/src/bin/two.rs b/src/log-instrument/examples/two.rs similarity index 100% rename from src/log-instrument/src/bin/two.rs rename to src/log-instrument/examples/two.rs diff --git a/src/log-instrument/tests/integration_tests.rs b/src/log-instrument/tests/integration_tests.rs deleted file mode 100644 index d944232c45d..00000000000 --- a/src/log-instrument/tests/integration_tests.rs +++ /dev/null @@ -1,148 +0,0 @@ -// Copyright 2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. -// SPDX-License-Identifier: Apache-2.0 - -const ONE: &str = env!("CARGO_BIN_EXE_one"); -const TWO: &str = env!("CARGO_BIN_EXE_two"); -const THREE: &str = env!("CARGO_BIN_EXE_three"); -const FOUR: &str = env!("CARGO_BIN_EXE_four"); -const FIVE: &str = env!("CARGO_BIN_EXE_five"); -const SIX: &str = env!("CARGO_BIN_EXE_six"); - -const TIMESTAMP_RANGE: std::ops::Range = 1..20; - -/// Match stderr to expected skipping bytes containing the timestamp. -fn check(actual: &[u8], expected: &[u8]) { - assert_eq!(actual.len(), expected.len()); - let mut j = 0; - for i in 0..actual.len() { - if actual[i] == b'\n' { - j = 0; - } - if TIMESTAMP_RANGE.contains(&j) { - continue; - } - assert_eq!(actual[i], expected[i]); - j += 1; - } -} - -#[test] -fn one() { - let output = std::process::Command::new(ONE).output().unwrap(); - assert!(output.status.success()); - assert_eq!(output.stdout, b""); - let expected_stderr = b"\ - [2023-10-12T16:29:00Z TRACE log_instrument] ThreadId(1)>>one\n\ - [2023-10-12T16:29:00Z DEBUG one] cmp: true\n\ - [2023-10-12T16:29:00Z TRACE log_instrument] ThreadId(1)<>one\n\ - [2023-10-12T16:29:00Z DEBUG one] cmp: false\n\ - [2023-10-12T16:29:00Z TRACE log_instrument] ThreadId(1)<>one\n\ - [2023-10-12T16:29:00Z DEBUG one] cmp: false\n\ - [2023-10-12T16:29:00Z TRACE log_instrument] ThreadId(1)<>one\n\ - [2023-10-12T16:29:30Z TRACE log_instrument] ThreadId(1)<>one\n\ - [2023-10-12T16:29:30Z DEBUG two] [\"a\", \"b\"]\n\ - [2023-10-12T16:29:30Z TRACE log_instrument] ThreadId(1)<>one\n\ - [2023-10-12T16:30:04Z TRACE log_instrument] ThreadId(1)<>one\n\ - [2023-10-12T16:30:04Z DEBUG three] [\"a\", \"b\"]\n\ - [2023-10-12T16:30:04Z TRACE log_instrument] ThreadId(1)<>one\n\ - [2023-10-12T16:30:37Z TRACE log_instrument] ThreadId(1)<>one\n\ - [2023-10-12T16:30:37Z DEBUG four] [\"a\", \"b\"]\n\ - [2023-10-12T16:30:37Z TRACE log_instrument] ThreadId(1)<>one\n\ - [2023-10-12T16:31:12Z TRACE log_instrument] ThreadId(1)<>one\n\ - [2023-10-12T16:31:12Z DEBUG five] [\"a\", \"b\"]\n\ - [2023-10-12T16:31:12Z DEBUG five] 23\n\ - [2023-10-12T16:31:12Z TRACE log_instrument] ThreadId(1)<>one\n\ - [2023-10-12T16:31:54Z DEBUG six] cmp: true\n\ - [2023-10-12T16:31:54Z TRACE log_instrument] ThreadId(1)<>one\n\ - [2023-10-12T16:31:54Z DEBUG six] cmp: false\n\ - [2023-10-12T16:31:54Z TRACE log_instrument] ThreadId(1)::one>>two\n\ - [2023-10-12T16:31:54Z DEBUG six] res: 0\n\ - [2023-10-12T16:31:54Z TRACE log_instrument] ThreadId(1)::one<>one\n\ - [2023-10-12T16:31:54Z DEBUG six] cmp: false\n\ - [2023-10-12T16:31:54Z TRACE log_instrument] ThreadId(1)::one>>two\n\ - [2023-10-12T16:31:54Z DEBUG six] res: 1\n\ - [2023-10-12T16:31:54Z TRACE log_instrument] ThreadId(1)::one<>one +[2023-10-12T16:29:00Z DEBUG one] cmp: true +[2023-10-12T16:29:00Z TRACE log_instrument] ThreadId(1)<>one +[2023-10-12T16:29:00Z DEBUG one] cmp: false +[2023-10-12T16:29:00Z TRACE log_instrument] ThreadId(1)<>one +[2023-10-12T16:29:00Z DEBUG one] cmp: false +[2023-10-12T16:29:00Z TRACE log_instrument] ThreadId(1)<>one +[2023-10-12T16:29:30Z TRACE log_instrument] ThreadId(1)<>one +[2023-10-12T16:29:30Z DEBUG two] [\"a\", \"b\"] +[2023-10-12T16:29:30Z TRACE log_instrument] ThreadId(1)<>one +[2023-10-12T16:30:04Z TRACE log_instrument] ThreadId(1)<>one +[2023-10-12T16:30:04Z DEBUG three] [\"a\", \"b\"] +[2023-10-12T16:30:04Z TRACE log_instrument] ThreadId(1)<>one +[2023-10-12T16:30:37Z TRACE log_instrument] ThreadId(1)<>one +[2023-10-12T16:30:37Z DEBUG four] [\"a\", \"b\"] +[2023-10-12T16:30:37Z TRACE log_instrument] ThreadId(1)<>one +[2023-10-12T16:31:12Z TRACE log_instrument] ThreadId(1)<>one +[2023-10-12T16:31:12Z DEBUG five] [\"a\", \"b\"] +[2023-10-12T16:31:12Z DEBUG five] 23 +[2023-10-12T16:31:12Z TRACE log_instrument] ThreadId(1)<>one +[2023-10-12T16:31:54Z DEBUG six] cmp: true +[2023-10-12T16:31:54Z TRACE log_instrument] ThreadId(1)<>one +[2023-10-12T16:31:54Z DEBUG six] cmp: false +[2023-10-12T16:31:54Z TRACE log_instrument] ThreadId(1)::one>>two +[2023-10-12T16:31:54Z DEBUG six] res: 0 +[2023-10-12T16:31:54Z TRACE log_instrument] ThreadId(1)::one<>one +[2023-10-12T16:31:54Z DEBUG six] cmp: false +[2023-10-12T16:31:54Z TRACE log_instrument] ThreadId(1)::one>>two +[2023-10-12T16:31:54Z DEBUG six] res: 1 +[2023-10-12T16:31:54Z TRACE log_instrument] ThreadId(1)::one<