Skip to content

Commit

Permalink
Make humility sensors work on dumps; add to test suite
Browse files Browse the repository at this point in the history
  • Loading branch information
mkeeter committed Jun 4, 2024
1 parent 019575e commit 3d9ab42
Show file tree
Hide file tree
Showing 395 changed files with 2,123 additions and 4 deletions.
10 changes: 6 additions & 4 deletions cmd/sensors/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -663,10 +663,6 @@ fn sensors(context: &mut ExecutionContext) -> Result<()> {
return Ok(());
}

if core.is_dump() {
bail!("cannot query sensor data from a dump");
}

if hubris.manifest.sensors.is_empty() {
bail!("no sensors found");
}
Expand All @@ -681,12 +677,18 @@ fn sensors(context: &mut ExecutionContext) -> Result<()> {

let mut reader: Box<dyn SensorReader> = match subargs.backend {
Some(Backend::Hiffy) => {
if core.is_dump() {
bail!("cannot use hiffy backend on dump");
}
let context = HiffyContext::new(hubris, core, subargs.timeout)?;
Box::new(HiffySensorReader::new(hubris, &sensors, context)?)
}
Some(Backend::Readmem) => {
Box::new(RamSensorReader::new(hubris, &sensors)?)
}
None if core.is_dump() => {
Box::new(RamSensorReader::new(hubris, &sensors)?)
}
None => match HiffyContext::new(hubris, core, subargs.timeout) {
Ok(ctx) => Box::new(HiffySensorReader::new(hubris, &sensors, ctx)?),
Err(_) => Box::new(RamSensorReader::new(hubris, &sensors)?),
Expand Down
1 change: 1 addition & 0 deletions tests/cli_tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,7 @@ fn make_all_tests() -> Result<()> {
"HUBRIS_TASK_DESCS",
),
Test::witharg(Kind::All, "sensors", "sensors", "--list"),
Test::witharg(Kind::Postmortem, "sensors-read", "sensors", ""),
Test::basic(Kind::Postmortem, "stackmargin"),
Test::basic(Kind::Postmortem, "tasks"),
Test::witharg(Kind::Postmortem, "tasks-slvr", "tasks", "-slvr"),
Expand Down
2 changes: 2 additions & 0 deletions tests/cmd/sensors-read/sensors-read.chilly.0.stderr

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Empty file.
10 changes: 10 additions & 0 deletions tests/cmd/sensors-read/sensors-read.chilly.0.toml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions tests/cmd/sensors-read/sensors-read.counters.0.stderr

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

134 changes: 134 additions & 0 deletions tests/cmd/sensors-read/sensors-read.counters.0.stdout

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions tests/cmd/sensors-read/sensors-read.counters.0.toml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Empty file.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions tests/cmd/sensors-read/sensors-read.extern-regions.stderr

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Empty file.
10 changes: 10 additions & 0 deletions tests/cmd/sensors-read/sensors-read.extern-regions.toml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Empty file.
10 changes: 10 additions & 0 deletions tests/cmd/sensors-read/sensors-read.flash-ram-mismatch.0.toml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 3d9ab42

Please sign in to comment.