Skip to content

Commit dfc5e00

Browse files
committed
feat: use the target triple without unknown in tests, build in the action with multiple triples
1 parent d8f02b8 commit dfc5e00

File tree

3 files changed

+9
-8
lines changed

3 files changed

+9
-8
lines changed

.github/workflows/linux.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,8 @@ jobs:
4949
run: |
5050
echo "Build command : ./scripts/build.sh --build --release"
5151
./scripts/build.sh --build --release --package \
52-
--target x86_64-unknown-linux-gnu,aarch64-unknown-linux-gnu
52+
--target x86_64-linux-gnu,aarch64-linux-gnu \
53+
x86_64-unknown-linux-gnu,aarch64-unknown-linux-gnu
5354
5455
- uses: actions/upload-artifact@master
5556
with:

tests/integration/build_description_tests.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,13 @@ fn exports_env_variable() {
4545
"build",
4646
&get_test_file("json/build_to_temp.json"),
4747
"--target",
48-
"aarch64-unknown-linux-gnu",
48+
"aarch64-linux-gnu",
4949
"--build-location",
5050
dir.path().to_str().unwrap(),
5151
];
5252
compile(parameters).unwrap();
5353

54-
assert_eq!(std::env::var("ARCH").unwrap(), "aarch64-unknown-linux-gnu");
54+
assert_eq!(std::env::var("ARCH").unwrap(), "aarch64-linux-gnu");
5555
}
5656

5757
#[test]
@@ -86,13 +86,13 @@ fn build_with_target_but_without_sysroot() {
8686
"build",
8787
&get_test_file("json/build_without_sysroot.json"),
8888
"--target",
89-
"x86_64-unknown-linux-gnu",
89+
"x86_64-linux-gnu",
9090
"--build-location",
9191
dir.path().to_str().unwrap(),
9292
];
9393
compile(parameters).unwrap();
9494

95-
assert!(dir.path().join("x86_64-unknown-linux-gnu").join("proj.so").is_file());
95+
assert!(dir.path().join("x86_64-linux-gnu").join("proj.so").is_file());
9696
}
9797

9898
#[test]
@@ -102,15 +102,15 @@ fn build_with_cc_linker() {
102102
let dir = tempfile::tempdir().unwrap();
103103
let arch = match () {
104104
#[cfg(target_arch = "x86_64")]
105-
_ => "x86_64-unknown-linux-gnu",
105+
_ => "x86_64-linux-gnu",
106106

107107
#[cfg(target_arch = "aarch64")]
108108
_ => match () {
109109
#[cfg(target_os = "macos")]
110110
_ => "aarch64-apple-darwin",
111111

112112
#[cfg(not(target_os = "macos"))]
113-
_ => "aarch64-unknown-linux-gnu",
113+
_ => "aarch64-linux-gnu",
114114
},
115115
};
116116

tests/integration/external_files.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ fn compile_all(name: &str, encoding: Option<&'static Encoding>) {
1313
let out_name = format!("{}.out", &name);
1414
out.push(out_name);
1515
let out = out.into_os_string().into_string().unwrap();
16-
let mut main_args = vec!["plc", &path, "-o", &out, "-Odefault", "--target", "x86_64-unknown-linux-pc"];
16+
let mut main_args = vec!["plc", &path, "-o", &out, "-Odefault", "--target", "x86_64-linux-pc"];
1717
if let Some(encoding) = encoding {
1818
main_args.push("--encoding");
1919
main_args.push(encoding.name());

0 commit comments

Comments
 (0)