Small fix in build for dynamic rustyrts

tum-i4 · Jun 25, 2024 · 6035bdc · 6035bdc
1 parent 92909bd
commit 6035bdc
Show file tree

Hide file tree

Showing 5 changed files with 713 additions and 708 deletions.
diff --git a/src/lab.rs b/src/lab.rs
@@ -248,7 +248,7 @@ fn test_scenario(
                 create_dir_all(Path::new(&(target_dir.clone() + "/.rts_dynamic"))).unwrap();
 
                 Some(vec![
-                    ("RUSTC_WRAPPER", rustyrts_bin),
+                    ("RUSTC", rustyrts_bin),
                     ("CARGO_TARGET_DIR", target_dir),
                     ("RUSTYRTS_ONLY_INSTRUMENTATION", "true".to_string()),
                 ])
@@ -307,7 +307,7 @@ fn test_scenario(
             create_dir_all(Path::new(&(target_dir.clone() + "/.rts_dynamic"))).unwrap();
 
             Some(vec![
-                ("RUSTC_WRAPPER", rustyrts_bin),
+                ("RUSTC", rustyrts_bin),
                 ("CARGO_TARGET_DIR", target_dir),
                 ("RUSTYRTS_ONLY_INSTRUMENTATION", "true".to_string()),
             ])

diff --git a/src/options.rs b/src/options.rs
@@ -186,14 +186,19 @@ impl Options {
         );
 
         let json_args = if args.json {
-            vec!["-Zunstable-options", "--format=json", "--report-time"]
+            let mut vec = Vec::new();
+            if !args.cargo_test_args.iter().any(|s| s == "--") {
+                vec.push("--");
+            }
+            vec.extend_from_slice(&["-Zunstable-options", "--format=json", "--report-time"]);
+            vec
         } else {
             Vec::new()
         };
 
         let gitignore = {
             match args.test_tool {
-                Some(TestTool::Dynamic) | Some(TestTool::Static) => false,
+                Some(TestTool::Dynamic | TestTool::Static) => false,
                 _ => args.gitignore,
             }
         };