Merge adc189d into e3d4c6a

apache · Jul 21, 2021 · 2049c28 · 2049c28
2 parents e3d4c6a + adc189d
commit 2049c28
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 1 deletion.
diff --git a/.github/workflows/miri.yaml b/.github/workflows/miri.yaml
@@ -57,4 +57,4 @@ jobs:
           cargo clean
           # Currently only the arrow crate is tested with miri
           # IO related tests and some unsupported tests are skipped
-          cargo miri test -p arrow -- --skip csv --skip ipc --skip json || true
+          cargo miri test -p arrow -- --skip csv --skip ipc --skip json
diff --git a/arrow/src/array/ffi.rs b/arrow/src/array/ffi.rs
@@ -96,6 +96,7 @@ mod tests {
     }
 
     #[test]
+    #[cfg_attr(miri, ignore)] // https://github.com/apache/arrow-rs/issues/580
     fn test_struct() -> Result<()> {
         let inner = StructArray::from(vec![
             (

diff --git a/arrow/src/datatypes/ffi.rs b/arrow/src/datatypes/ffi.rs
@@ -305,6 +305,7 @@ mod tests {
     }
 
     #[test]
+    #[cfg_attr(miri, ignore)] // https://github.com/apache/arrow-rs/issues/580
     fn test_type() -> Result<()> {
         round_trip_type(DataType::Int64)?;
         round_trip_type(DataType::UInt64)?;
@@ -326,13 +327,15 @@ mod tests {
     }
 
     #[test]
+    #[cfg_attr(miri, ignore)] // https://github.com/apache/arrow-rs/issues/580
     fn test_field() -> Result<()> {
         let dtype = DataType::Struct(vec![Field::new("a", DataType::Utf8, true)]);
         round_trip_field(Field::new("test", dtype, true))?;
         Ok(())
     }
 
     #[test]
+    #[cfg_attr(miri, ignore)] // https://github.com/apache/arrow-rs/issues/580
     fn test_schema() -> Result<()> {
         let schema = Schema::new(vec![
             Field::new("name", DataType::Utf8, false),

diff --git a/arrow/src/ffi.rs b/arrow/src/ffi.rs
@@ -911,11 +911,13 @@ mod tests {
     }
 
     #[test]
+    #[cfg_attr(miri, ignore)] // https://github.com/apache/arrow-rs/issues/580
     fn test_list() -> Result<()> {
         test_generic_list::<i32>()
     }
 
     #[test]
+    #[cfg_attr(miri, ignore)] // https://github.com/apache/arrow-rs/issues/580
     fn test_large_list() -> Result<()> {
         test_generic_list::<i64>()
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -96,6 +96,7 @@ mod tests { @@
         }
         #[test]
+        #[cfg_attr(miri, ignore)] // https://github.com/apache/arrow-rs/issues/580
         fn test_struct() -> Result<()> {
             let inner = StructArray::from(vec![
                 (
@@ Expand Down @@