Skip to content

Commit 417f1ee

Browse files
committed
libc: change ctest name to ctest-old
1 parent 2e670a8 commit 417f1ee

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 {
@@ -3349,7 +3349,7 @@ fn test_neutrino(target: &str) {
33493349
});
33503350

33513351
cfg.volatile_item(|i| {
3352-
use ctest::VolatileItemKind::*;
3352+
use ctest_old::VolatileItemKind::*;
33533353
match i {
33543354
// The following fields are volatie but since we cannot express that in
33553355
// Rust types, we have to explicitly tell the checker about it here:
@@ -3462,7 +3462,7 @@ fn test_neutrino(target: &str) {
34623462
fn test_vxworks(target: &str) {
34633463
assert!(target.contains("vxworks"));
34643464

3465-
let mut cfg = ctest::TestGenerator::new();
3465+
let mut cfg = ctest_old::TestGenerator::new();
34663466
headers! { cfg:
34673467
"vxWorks.h",
34683468
"yvals.h",
@@ -3563,7 +3563,7 @@ fn test_vxworks(target: &str) {
35633563
cfg.generate(src_hotfix_dir().join("lib.rs"), "ctest_output.rs");
35643564
}
35653565

3566-
fn config_gnu_bits(target: &str, cfg: &mut ctest::TestGenerator) {
3566+
fn config_gnu_bits(target: &str, cfg: &mut ctest_old::TestGenerator) {
35673567
let pointer_width = env::var("CARGO_CFG_TARGET_POINTER_WIDTH").unwrap_or_default();
35683568
if target.contains("gnu")
35693569
&& target.contains("linux")
@@ -4734,7 +4734,7 @@ fn test_linux(target: &str) {
47344734
});
47354735

47364736
cfg.volatile_item(|i| {
4737-
use ctest::VolatileItemKind::*;
4737+
use ctest_old::VolatileItemKind::*;
47384738
match i {
47394739
// aio_buf is a volatile void** but since we cannot express that in
47404740
// Rust types, we have to explicitly tell the checker about it here:
@@ -5055,7 +5055,7 @@ fn test_haiku(target: &str) {
50555055
cfg.flag("-Wno-deprecated-declarations");
50565056
cfg.define("__USE_GNU", Some("1"));
50575057
cfg.define("_GNU_SOURCE", None);
5058-
cfg.language(ctest::Lang::CXX);
5058+
cfg.language(ctest_old::Lang::CXX);
50595059

50605060
// POSIX API
50615061
headers! { cfg:
@@ -5661,7 +5661,7 @@ fn test_aix(target: &str) {
56615661
});
56625662

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

0 commit comments

Comments
 (0)