Merge pull request #1462 from PLC-lang/target

feat: use the target triple without unknown in tests

Author: ghaith

.github/workflows/linux.yml

@@ -49,7 +49,8 @@ jobs:
         run: |
           echo "Build command : ./scripts/build.sh --build --release"
           ./scripts/build.sh --build --release --package \
-          --target x86_64-unknown-linux-gnu,aarch64-unknown-linux-gnu
+          --target x86_64-linux-gnu,aarch64-linux-gnu, \
+          x86_64-unknown-linux-gnu,aarch64-unknown-linux-gnu
 
       - uses: actions/upload-artifact@master
         with:

scripts/build.sh

@@ -91,6 +91,10 @@ function run_std_build() {
     if [[ ! -z $target ]]; then
         for val in ${target//,/ }
         do
+            # if the target ends with -linux-gnu but does not have unknown, add unknown
+            if [[ $val == *"-linux-gnu" && $val != *"unknown-linux-gnu" ]]; then
+                val="${val/-linux-gnu/-unknown-linux-gnu}"
+            fi
             new_cmd="$cmd --target=$val"
             log "Running $new_cmd"
             eval "$new_cmd"
@@ -129,7 +133,7 @@ function run_doc() {
     log "Building book"
     log "Building preprocessor for the book"
     cargo build --release -p errorcode_book_generator
-    cd book && mdbook build 
+    cd book && mdbook build
     # test is disabled because not all files in the book exist. The pre-processor for error codes adds new files
     # mdbook test
 }
@@ -163,7 +167,7 @@ function run_test() {
         rm -rf "$project_location/test_results"
         make_dir "$project_location/test_results"
         # JUnit test should run via cargo-nextest
-        log "cargo-nextest nextest run $CARGO_OPTIONS --lib --profile ci \ 
+        log "cargo-nextest nextest run $CARGO_OPTIONS --lib --profile ci \
         mv "$project_location"/target/nextest/ci/junit.xml "$project_location"/test_results/unit_tests.xml"
         cargo-nextest nextest run $CARGO_OPTIONS --lib --profile ci
         mv "$project_location"/target/nextest/ci/junit.xml "$project_location"/test_results/unit_tests.xml
@@ -176,11 +180,11 @@ function run_test() {
         mv "$project_location"/target/nextest/ci/junit.xml "$project_location"/test_results/integration_tests.xml
 
         # Run the std integration
-        log "cargo-nextest nextest run $CARGO_OPTIONS --profile ci -p iec61131std --test '*' \ 
+        log "cargo-nextest nextest run $CARGO_OPTIONS --profile ci -p iec61131std --test '*' \
         mv "$project_location"/target/nextest/ci/junit.xml "$project_location"/test_results/std_integration_tests.xml"
         cargo-nextest nextest run $CARGO_OPTIONS --profile ci -p iec61131std --test '*'
         mv "$project_location"/target/nextest/ci/junit.xml "$project_location"/test_results/std_integration_tests.xml
-        
+
     else
         cargo test $CARGO_OPTIONS --workspace
     fi
@@ -222,7 +226,12 @@ function run_package_std() {
         do
             lib_dir=$OUTPUT_DIR/$val/lib
             make_dir $lib_dir
-            rel_dir="$target_dir/$val"
+
+            # if the target ends with -linux-gnu but does not have unknown, add unknown
+            if [[ $val == *"-linux-gnu" && $val != *"unknown-linux-gnu" ]]; then
+                rustc_target="${val/-linux-gnu/-unknown-linux-gnu}"
+            fi
+            rel_dir="$target_dir/$rustc_target"
             if [[ $release -ne 0 ]]; then
                 rel_dir="$rel_dir/release"
             else

tests/integration/build_description_tests.rs

@@ -45,13 +45,13 @@ fn exports_env_variable() {
         "build",
         &get_test_file("json/build_to_temp.json"),
         "--target",
-        "aarch64-unknown-linux-gnu",
+        "aarch64-linux-gnu",
         "--build-location",
         dir.path().to_str().unwrap(),
     ];
     compile(parameters).unwrap();
 
-    assert_eq!(std::env::var("ARCH").unwrap(), "aarch64-unknown-linux-gnu");
+    assert_eq!(std::env::var("ARCH").unwrap(), "aarch64-linux-gnu");
 }
 
 #[test]
@@ -86,13 +86,13 @@ fn build_with_target_but_without_sysroot() {
         "build",
         &get_test_file("json/build_without_sysroot.json"),
         "--target",
-        "x86_64-unknown-linux-gnu",
+        "x86_64-linux-gnu",
         "--build-location",
         dir.path().to_str().unwrap(),
     ];
     compile(parameters).unwrap();
 
-    assert!(dir.path().join("x86_64-unknown-linux-gnu").join("proj.so").is_file());
+    assert!(dir.path().join("x86_64-linux-gnu").join("proj.so").is_file());
 }
 
 #[test]
@@ -102,15 +102,15 @@ fn build_with_cc_linker() {
     let dir = tempfile::tempdir().unwrap();
     let arch = match () {
         #[cfg(target_arch = "x86_64")]
-        _ => "x86_64-unknown-linux-gnu",
+        _ => "x86_64-linux-gnu",
 
         #[cfg(target_arch = "aarch64")]
         _ => match () {
             #[cfg(target_os = "macos")]
             _ => "aarch64-apple-darwin",
 
             #[cfg(not(target_os = "macos"))]
-            _ => "aarch64-unknown-linux-gnu",
+            _ => "aarch64-linux-gnu",
         },
     };
 

tests/integration/external_files.rs

@@ -13,7 +13,7 @@ fn compile_all(name: &str, encoding: Option<&'static Encoding>) {
     let out_name = format!("{}.out", &name);
     out.push(out_name);
     let out = out.into_os_string().into_string().unwrap();
-    let mut main_args = vec!["plc", &path, "-o", &out, "-Odefault", "--target", "x86_64-unknown-linux-pc"];
+    let mut main_args = vec!["plc", &path, "-o", &out, "-Odefault", "--target", "x86_64-linux-pc"];
     if let Some(encoding) = encoding {
         main_args.push("--encoding");
         main_args.push(encoding.name());