Skip to content

Commit b040f36

Browse files
committed
libc: change ctest name to ctest-old
1 parent 1e8377c commit b040f36

File tree

3 files changed

+23
-11
lines changed

3 files changed

+23
-11
lines changed

Cargo.lock

Lines changed: 14 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

libc-test/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ annotate-snippets = { version = "0.11.5", features = ["testing-colors"] }
2020

2121
[build-dependencies]
2222
cc = "1.2.29"
23-
ctest = { path = "../ctest" }
23+
ctest-old = { version = "0.4.11", package = "ctest" }
2424
ctest-next = { path = "../ctest-next" }
2525
regex = "1.11.1"
2626

libc-test/build.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,8 @@ fn do_ctest() {
7373
}
7474
}
7575

76-
fn ctest_cfg() -> ctest::TestGenerator {
77-
ctest::TestGenerator::new()
76+
fn ctest_cfg() -> ctest_old::TestGenerator {
77+
ctest_old::TestGenerator::new()
7878
}
7979

8080
fn ctest_next_cfg() -> ctest_next::TestGenerator {
@@ -3337,7 +3337,7 @@ fn test_neutrino(target: &str) {
33373337
});
33383338

33393339
cfg.volatile_item(|i| {
3340-
use ctest::VolatileItemKind::*;
3340+
use ctest_old::VolatileItemKind::*;
33413341
match i {
33423342
// The following fields are volatie but since we cannot express that in
33433343
// Rust types, we have to explicitly tell the checker about it here:
@@ -3450,7 +3450,7 @@ fn test_neutrino(target: &str) {
34503450
fn test_vxworks(target: &str) {
34513451
assert!(target.contains("vxworks"));
34523452

3453-
let mut cfg = ctest::TestGenerator::new();
3453+
let mut cfg = ctest_old::TestGenerator::new();
34543454
headers! { cfg:
34553455
"vxWorks.h",
34563456
"yvals.h",
@@ -3551,7 +3551,7 @@ fn test_vxworks(target: &str) {
35513551
cfg.generate(src_hotfix_dir().join("lib.rs"), "ctest_output.rs");
35523552
}
35533553

3554-
fn config_gnu_bits(target: &str, cfg: &mut ctest::TestGenerator) {
3554+
fn config_gnu_bits(target: &str, cfg: &mut ctest_old::TestGenerator) {
35553555
let pointer_width = env::var("CARGO_CFG_TARGET_POINTER_WIDTH").unwrap_or_default();
35563556
if target.contains("gnu")
35573557
&& target.contains("linux")
@@ -4722,7 +4722,7 @@ fn test_linux(target: &str) {
47224722
});
47234723

47244724
cfg.volatile_item(|i| {
4725-
use ctest::VolatileItemKind::*;
4725+
use ctest_old::VolatileItemKind::*;
47264726
match i {
47274727
// aio_buf is a volatile void** but since we cannot express that in
47284728
// Rust types, we have to explicitly tell the checker about it here:
@@ -5043,7 +5043,7 @@ fn test_haiku(target: &str) {
50435043
cfg.flag("-Wno-deprecated-declarations");
50445044
cfg.define("__USE_GNU", Some("1"));
50455045
cfg.define("_GNU_SOURCE", None);
5046-
cfg.language(ctest::Lang::CXX);
5046+
cfg.language(ctest_old::Lang::CXX);
50475047

50485048
// POSIX API
50495049
headers! { cfg:
@@ -5641,7 +5641,7 @@ fn test_aix(target: &str) {
56415641
});
56425642

56435643
cfg.volatile_item(|i| {
5644-
use ctest::VolatileItemKind::*;
5644+
use ctest_old::VolatileItemKind::*;
56455645
match i {
56465646
// 'aio_buf' is of type 'volatile void**' but since we cannot
56475647
// express that in Rust types, we have to explicitly tell the

0 commit comments

Comments
 (0)