Skip to content

Commit 8671c85

Browse files
Merge pull request #337 from mkroening/cargo-non_kebab_case_bins
fix(tools): Fix `cargo::non_kebab_case_bins`
2 parents c526710 + bbac15d commit 8671c85

29 files changed

Lines changed: 57 additions & 57 deletions

‎.cargo/config.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
[alias]
2-
run_tests = "run --manifest-path tools/aml_tester/Cargo.toml --"
2+
run_tests = "run --manifest-path tools/aml-tester/Cargo.toml --"

‎.github/workflows/build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,5 +93,5 @@ jobs:
9393
rustup default nightly
9494
9595
- name: Build no alloc test exe
96-
working-directory: tools/no_alloc_check
96+
working-directory: tools/no-alloc-check
9797
run: cargo build

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ tests/*.aml
55
tests/*.lst
66
tests/*.txt
77
dumps/
8-
tools/no_alloc_check/target
8+
tools/no-alloc-check/target

‎Cargo.toml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[workspace]
2-
members = ["tools/aml_tester", "tools/acpi_dumper", "tools/aml_test_tools", "tools/uacpi_test_adapter"]
3-
# See the note in the no_alloc_check README.md to see why this is excluded.
4-
exclude = ["tools/no_alloc_check"]
2+
members = ["tools/aml-tester", "tools/acpi-dumper", "tools/aml-test-tools", "tools/uacpi-test-adapter"]
3+
# See the note in the no-alloc-check README.md to see why this is excluded.
4+
exclude = ["tools/no-alloc-check"]
55
resolver = "2"
66

77
[package]
@@ -24,7 +24,7 @@ byteorder = { version = "1.5.0", optional = true, default-features = false }
2424
smallvec = { version = "1.15.2", optional = true, default-features = false }
2525

2626
[dev-dependencies]
27-
aml_test_tools = { path = "tools/aml_test_tools" }
27+
aml-test-tools = { path = "tools/aml-test-tools" }
2828
lock_api = "0.4.14"
2929
parking_lot = "0.12.5"
3030
pretty_env_logger = "0.5.0"

‎tests/README.md‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ There are 4 categories of tests:
44

55
1. Unit tests in the main crate source.
66
2. Integration tests in the `tests` directory - these all have the extension `.rs`.
7-
3. Raw ASL files that can be checked using `aml_tester`
7+
3. Raw ASL files that can be checked using `aml-tester`
88
4. Support for running tests from the `uacpi` project.
99

1010
## Unit tests
@@ -15,23 +15,23 @@ relatively few unit tests at present - feel free to send PRs with more!
1515
## Integration tests
1616

1717
These are the `.rs` files in the `tests` directory. They largely consist of snippets of ASL code that are parsed and
18-
then executed using the `aml_test_tools` sub-crate. Most of the tests specify the expected output from the provided
18+
then executed using the `aml-test-tools` sub-crate. Most of the tests specify the expected output from the provided
1919
`Handler`, which provides reasonable confidence the parser is working correctly.
2020

21-
The `aml_test_tools` sub-crate provides various utilities for writing this style of test.
21+
The `aml-test-tools` sub-crate provides various utilities for writing this style of test.
2222

2323
Like the unit tests, they can be run using `cargo test`.
2424

2525
## Raw ASL files
2626

2727
Various ASL files are provided in the `tests` directory. They can be parsed and executed by running
28-
`cargo run_tests -p tests` from the root of the repository. This cargo alias runs the `aml_tester` tool.
28+
`cargo run_tests -p tests` from the root of the repository. This cargo alias runs the `aml-tester` tool.
2929

30-
The `aml_tester` tool provides a command-line way to run ASL files - similar to `acpiexec`.
30+
The `aml-tester` tool provides a command-line way to run ASL files - similar to `acpiexec`.
3131

3232
## Running tests from the `uacpi` project
3333

34-
> See the documentation for `uacpi_test_adapter` for more detailed information. Note that a large proportion of the
34+
> See the documentation for `uacpi-test-adapter` for more detailed information. Note that a large proportion of the
3535
> tests in the `uacpi` project do not yet pass in this crate.
3636
3737
The `uacpi` project has a fairly extensive test suite. It makes sense for us to be able to check against their test
@@ -41,10 +41,10 @@ suite as well as our own. This can be done by:
4141
2. Navigating to the root of that repo.
4242
3. Running something like:
4343
```shell
44-
python3 tests/run_tests.py --test-runner ../acpi/target/debug/uacpi_test_adapter
44+
python3 tests/run_tests.py --test-runner ../acpi/target/debug/uacpi-test-adapter
4545
```
46-
Adjusting the paths as necessary. See the `uacpi_test_adapter` documentation for details on how it finds
47-
`aml_tester`.
46+
Adjusting the paths as necessary. See the `uacpi-test-adapter` documentation for details on how it finds
47+
`aml-tester`.
4848

4949
Note that, at present, several of the uACPI tests run indefinitely. You may want to skip these! The easiest way to do so
5050
is probably just to delete them... The relevant tests are:

‎tests/multi_table.asl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
/* This file is a test for `aml_tester` rather than of the parser itself.
2-
* Can `aml_tester` cope with multiple tables?
1+
/* This file is a test for `aml-tester` rather than of the parser itself.
2+
* Can `aml-tester` cope with multiple tables?
33
*/
44
DefinitionBlock("", "DSDT", 1, "RSACPI", "BUFFLD", 1) {
55
OperationRegion(MEM, SystemMemory, 0x40000, 0x1000)
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[package]
2-
name = "acpi_dumper"
2+
name = "acpi-dumper"
33
version = "0.0.0"
44
publish = false
55
authors = ["Isaac Woods", "Matt Taylor"]
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[package]
2-
name = "aml_test_tools"
2+
name = "aml-test-tools"
33
version = "0.1.0"
44
authors = ["Isaac Woods", "Martin Hughes"]
55
edition = "2024"

tools/aml_test_tools/src/handlers/check_cmd_handler.rs renamed to tools/aml-test-tools/src/handlers/check_cmd_handler.rs

File renamed without changes.

0 commit comments

Comments
 (0)