Cover all architecture variations in gen_rs tests

This commit is contained in:
Richard Feldman 2022-05-24 10:49:36 -04:00
parent f56e07669c
commit 777625be21
No known key found for this signature in database
GPG key ID: 7E4127D1E4241798
2 changed files with 8 additions and 11 deletions

View file

@ -107,6 +107,11 @@ mod test_gen_rs {
.unwrap_or_default(), .unwrap_or_default(),
indoc!( indoc!(
r#" r#"
#[cfg(any(
target_arch = "x86_64",
target_arch = "aarch64",
target_arch = "arm"
))]
#[derive(Clone, Debug, Default, PartialEq, PartialOrd)] #[derive(Clone, Debug, Default, PartialEq, PartialOrd)]
#[repr(C)] #[repr(C)]
pub struct R1 { pub struct R1 {

View file

@ -1,7 +1,6 @@
use roc_bindgen::bindgen_rs; use roc_bindgen::bindgen_rs;
use roc_bindgen::load::load_types; use roc_bindgen::load::load_types;
use roc_load::Threading; use roc_load::Threading;
use roc_target::Architecture;
use std::env; use std::env;
use std::fs::File; use std::fs::File;
use std::io::Write; use std::io::Write;
@ -26,9 +25,7 @@ pub fn generate_bindings(decl_src: &str) -> String {
src.push_str(decl_src); src.push_str(decl_src);
// Only use the X86_64 types for these tests let pairs = {
let target_arch = Architecture::X86_64;
let types = {
let dir = tempdir().expect("Unable to create tempdir"); let dir = tempdir().expect("Unable to create tempdir");
let filename = PathBuf::from("Package-Config.roc"); let filename = PathBuf::from("Package-Config.roc");
let file_path = dir.path().join(filename); let file_path = dir.path().join(filename);
@ -41,14 +38,9 @@ pub fn generate_bindings(decl_src: &str) -> String {
dir.close().expect("Unable to close tempdir"); dir.close().expect("Unable to close tempdir");
result.expect("had problems loading") result.expect("had problems loading")
} };
.iter()
.find(|(architecture, _)| *architecture == target_arch)
.unwrap()
.1
.clone();
bindgen_rs::emit(&[(target_arch, types)]) bindgen_rs::emit(&pairs)
} }
#[allow(dead_code)] #[allow(dead_code)]