Fix concurrency in libcasr tests (#191)

ispras · Dec 9, 2023 · d7a82a3 · d7a82a3
1 parent 47adf77
commit d7a82a3
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 14 deletions.
diff --git a/libcasr/src/js.rs b/libcasr/src/js.rs
@@ -233,7 +233,7 @@ impl ParseStacktrace for JsStacktrace {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::{init_ignored_frames, stacktrace::CrashLineExt, stacktrace::Filter};
+    use crate::stacktrace::{tests::safe_init_ignore_stack_frames, CrashLineExt, Filter};
 
     #[test]
     fn test_js_stacktrace() {
@@ -310,7 +310,7 @@ Uncaught ReferenceError: var is not defined
         }
         let mut stacktrace = sttr.unwrap();
 
-        init_ignored_frames!("js");
+        safe_init_ignore_stack_frames();
         stacktrace.filter();
 
         // Check crashline

diff --git a/libcasr/src/report.rs b/libcasr/src/report.rs
@@ -796,10 +796,7 @@ pub fn cluster_reports(casreps: &[CrashReport]) -> Result<Vec<usize>> {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::{
-        init_ignored_frames,
-        stacktrace::{Filter, Stacktrace},
-    };
+    use crate::stacktrace::tests::safe_init_ignore_stack_frames;
 
     #[test]
     fn test_report_display() {
@@ -962,7 +959,7 @@ mod tests {
         ];
 
         // Init ignored frames for correct filtering
-        init_ignored_frames!("cpp");
+        safe_init_ignore_stack_frames();
 
         let res = dedup_reports(&[report.clone(), report.clone()]);
         let Ok(res) = res else {
@@ -986,7 +983,7 @@ mod tests {
         ];
 
         // Init ignored frames for correct filtering
-        init_ignored_frames!("cpp");
+        safe_init_ignore_stack_frames();
 
         let res = cluster_reports(&[report.clone(), report.clone()]);
         let Ok(res) = res else {

diff --git a/libcasr/src/rust.rs b/libcasr/src/rust.rs
@@ -107,10 +107,7 @@ impl ParseStacktrace for RustStacktrace {
 mod tests {
 
     use super::*;
-    use crate::{
-        init_ignored_frames,
-        stacktrace::{Filter, Stacktrace},
-    };
+    use crate::stacktrace::{tests::safe_init_ignore_stack_frames, Filter};
 
     #[test]
     fn test_rust_parse_stacktrace() {
@@ -267,7 +264,7 @@ SUMMARY: libFuzzer: deadly signal"#;
         assert_eq!(bt, trace);
 
         let mut stacktrace = RustStacktrace::parse_stacktrace(&bt).unwrap();
-        init_ignored_frames!("rust");
+        safe_init_ignore_stack_frames();
         stacktrace.filter();
 
         assert_eq!(stacktrace[0].address, 0x557e259648d8);

diff --git a/libcasr/src/stacktrace.rs b/libcasr/src/stacktrace.rs
@@ -439,9 +439,24 @@ fn get_interval_repetitions<T: PartialEq>(arr: &[T]) -> Vec<bool> {
 }
 
 #[cfg(test)]
-mod tests {
+pub mod tests {
+    use std::sync::RwLock;
+
     use crate::stacktrace::*;
 
+    lazy_static::lazy_static! {
+        static ref INITED_STACKFRAMES_FILTER: RwLock<bool> = RwLock::new(false);
+    }
+
+    /// Thread-safe initialization of all stackframe filters
+    pub fn safe_init_ignore_stack_frames() {
+        let mut is_inited = INITED_STACKFRAMES_FILTER.write().unwrap();
+        if !*is_inited {
+            *is_inited = true;
+            init_ignored_frames!("cpp", "rust", "python", "go", "java", "js");
+        }
+    }
+
     #[test]
     fn test_main_lorentz() {
         let tests = [