Skip to content

Commit fef089c

Browse files
committed
Rename the ctest file from main to ctest
Make it more obvious what this test is about.
1 parent 0442ebb commit fef089c

File tree

4 files changed

+22
-22
lines changed

4 files changed

+22
-22
lines changed

ci/create-artifacts.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414

1515

1616
def main():
17-
# Find the most recently touched file named "main.c" in the target
17+
# Find the most recently touched file named "ctest_output.c" in the target
1818
# directory. This will be libc-tests's `OUT_DIR`
19-
marker_files = [Path(p) for p in glob("target/**/main.c", recursive=True)]
19+
marker_files = [Path(p) for p in glob("target/**/ctest_output.c", recursive=True)]
2020
marker_files.sort(key=lambda path: path.stat().st_mtime)
2121
build_dir = marker_files[0].parent
2222
print(f"Located build directory '{build_dir}'")

libc-test/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ std = ["libc/std"]
2929
extra_traits = ["libc/extra_traits"]
3030

3131
[[test]]
32-
name = "main"
33-
path = "test/main.rs"
32+
name = "ctest"
33+
path = "test/ctest.rs"
3434
harness = false
3535

3636
[[test]]

libc-test/build.rs

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -469,7 +469,7 @@ fn test_apple(target: &str) {
469469
"uuid_t" | "vol_capabilities_set_t" => true,
470470
_ => false,
471471
});
472-
cfg.generate(src_hotfix_dir().join("lib.rs"), "main.rs");
472+
cfg.generate(src_hotfix_dir().join("lib.rs"), "ctest_output.rs");
473473
}
474474

475475
fn test_openbsd(target: &str) {
@@ -622,7 +622,7 @@ fn test_openbsd(target: &str) {
622622
}
623623
});
624624

625-
cfg.generate(src_hotfix_dir().join("lib.rs"), "main.rs");
625+
cfg.generate(src_hotfix_dir().join("lib.rs"), "ctest_output.rs");
626626
}
627627

628628
fn test_cygwin(target: &str) {
@@ -791,7 +791,7 @@ fn test_cygwin(target: &str) {
791791
}
792792
});
793793

794-
cfg.generate(src_hotfix_dir().join("lib.rs"), "main.rs");
794+
cfg.generate(src_hotfix_dir().join("lib.rs"), "ctest_output.rs");
795795
}
796796

797797
fn test_windows(target: &str) {
@@ -913,7 +913,7 @@ fn test_windows(target: &str) {
913913

914914
cfg.skip_fn(|_| false);
915915

916-
cfg.generate(src_hotfix_dir().join("lib.rs"), "main.rs");
916+
cfg.generate(src_hotfix_dir().join("lib.rs"), "ctest_output.rs");
917917
}
918918

919919
fn test_redox(target: &str) {
@@ -963,7 +963,7 @@ fn test_redox(target: &str) {
963963
"wchar.h",
964964
}
965965

966-
cfg.generate(src_hotfix_dir().join("lib.rs"), "main.rs");
966+
cfg.generate(src_hotfix_dir().join("lib.rs"), "ctest_output.rs");
967967
}
968968

969969
fn test_solarish(target: &str) {
@@ -1244,7 +1244,7 @@ fn test_solarish(target: &str) {
12441244
}
12451245
});
12461246

1247-
cfg.generate(src_hotfix_dir().join("lib.rs"), "main.rs");
1247+
cfg.generate(src_hotfix_dir().join("lib.rs"), "ctest_output.rs");
12481248
}
12491249

12501250
fn test_netbsd(target: &str) {
@@ -1453,7 +1453,7 @@ fn test_netbsd(target: &str) {
14531453
}
14541454
});
14551455

1456-
cfg.generate(src_hotfix_dir().join("lib.rs"), "main.rs");
1456+
cfg.generate(src_hotfix_dir().join("lib.rs"), "ctest_output.rs");
14571457
}
14581458

14591459
fn test_dragonflybsd(target: &str) {
@@ -1669,7 +1669,7 @@ fn test_dragonflybsd(target: &str) {
16691669
(struct_ == "sigevent" && field == "sigev_notify_thread_id")
16701670
});
16711671

1672-
cfg.generate(src_hotfix_dir().join("lib.rs"), "main.rs");
1672+
cfg.generate(src_hotfix_dir().join("lib.rs"), "ctest_output.rs");
16731673
}
16741674

16751675
fn test_wasi(target: &str) {
@@ -1776,7 +1776,7 @@ fn test_wasi(target: &str) {
17761776
// doesn't support sizeof.
17771777
cfg.skip_field(|s, field| s == "dirent" && field == "d_name");
17781778

1779-
cfg.generate(src_hotfix_dir().join("lib.rs"), "main.rs");
1779+
cfg.generate(src_hotfix_dir().join("lib.rs"), "ctest_output.rs");
17801780
}
17811781

17821782
fn test_android(target: &str) {
@@ -2279,7 +2279,7 @@ fn test_android(target: &str) {
22792279
}
22802280
});
22812281

2282-
cfg.generate(src_hotfix_dir().join("lib.rs"), "main.rs");
2282+
cfg.generate(src_hotfix_dir().join("lib.rs"), "ctest_output.rs");
22832283

22842284
test_linux_like_apis(target);
22852285
}
@@ -2947,7 +2947,7 @@ fn test_freebsd(target: &str) {
29472947
});
29482948
}
29492949

2950-
cfg.generate(src_hotfix_dir().join("lib.rs"), "main.rs");
2950+
cfg.generate(src_hotfix_dir().join("lib.rs"), "ctest_output.rs");
29512951
}
29522952

29532953
fn test_emscripten(target: &str) {
@@ -3189,7 +3189,7 @@ fn test_emscripten(target: &str) {
31893189
].contains(&field))
31903190
});
31913191

3192-
cfg.generate(src_hotfix_dir().join("lib.rs"), "main.rs");
3192+
cfg.generate(src_hotfix_dir().join("lib.rs"), "ctest_output.rs");
31933193
}
31943194

31953195
fn test_neutrino(target: &str) {
@@ -3452,7 +3452,7 @@ fn test_neutrino(target: &str) {
34523452

34533453
cfg.skip_static(move |name| name == "__dso_handle");
34543454

3455-
cfg.generate(src_hotfix_dir().join("lib.rs"), "main.rs");
3455+
cfg.generate(src_hotfix_dir().join("lib.rs"), "ctest_output.rs");
34563456
}
34573457

34583458
fn test_vxworks(target: &str) {
@@ -3556,7 +3556,7 @@ fn test_vxworks(target: &str) {
35563556
_ => false,
35573557
});
35583558

3559-
cfg.generate(src_hotfix_dir().join("lib.rs"), "main.rs");
3559+
cfg.generate(src_hotfix_dir().join("lib.rs"), "ctest_output.rs");
35603560
}
35613561

35623562
fn config_gnu_bits(target: &str, cfg: &mut ctest::TestGenerator) {
@@ -4859,7 +4859,7 @@ fn test_linux(target: &str) {
48594859
_ => false,
48604860
});
48614861

4862-
cfg.generate(src_hotfix_dir().join("lib.rs"), "main.rs");
4862+
cfg.generate(src_hotfix_dir().join("lib.rs"), "ctest_output.rs");
48634863

48644864
test_linux_like_apis(target);
48654865
}
@@ -5369,7 +5369,7 @@ fn test_haiku(target: &str) {
53695369
s => s.to_string(),
53705370
}
53715371
});
5372-
cfg.generate(src_hotfix_dir().join("lib.rs"), "main.rs");
5372+
cfg.generate(src_hotfix_dir().join("lib.rs"), "ctest_output.rs");
53735373
}
53745374

53755375
fn test_aix(target: &str) {
@@ -5660,5 +5660,5 @@ fn test_aix(target: &str) {
56605660
}
56615661
});
56625662

5663-
cfg.generate(src_hotfix_dir().join("lib.rs"), "main.rs");
5663+
cfg.generate(src_hotfix_dir().join("lib.rs"), "ctest_output.rs");
56645664
}

libc-test/test/main.rs renamed to libc-test/test/ctest.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22

33
use libc::*;
44

5-
include!(concat!(env!("OUT_DIR"), "/main.rs"));
5+
include!(concat!(env!("OUT_DIR"), "/ctest_output.rs"));

0 commit comments

Comments
 (0)