feat(testing): Add CARGO_TARGET_DIR and use it from other crates (#…

…7552)

crates/swc_ecma_testing/Cargo.toml

@@ -16,3 +16,5 @@ anyhow  = "1"
 hex     = "0.4"
 sha-1   = "0.10"
 tracing = "0.1.32"
+
+testing = { version = "0.33.14", path = "../testing" }

crates/swc_ecma_testing/src/lib.rs

@@ -2,6 +2,7 @@ use std::{env, fs, path::PathBuf, process::Command};
 
 use anyhow::{bail, Context, Result};
 use sha1::{Digest, Sha1};
+use testing::CARGO_TARGET_DIR;
 use tracing::debug;
 
 #[derive(Debug, Default, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
@@ -26,20 +27,10 @@ pub struct JsExecOptions {
     pub args: Vec<String>,
 }
 
-fn cargo_manifest_dir() -> PathBuf {
-    env::var("CARGO_MANIFEST_DIR").unwrap().into()
-}
-
 fn cargo_cache_root() -> PathBuf {
     env::var("SWC_ECMA_TESTING_CACHE_DIR")
         .map(PathBuf::from)
-        .unwrap_or_else(|_| {
-            env::var("TARGET").map(PathBuf::from).unwrap_or_else(|_| {
-                let mut target_dir = cargo_manifest_dir();
-                target_dir.push("target");
-                target_dir
-            })
-        })
+        .unwrap_or_else(|_| CARGO_TARGET_DIR.clone())
 }
 
 /// Executes `js_code` and capture thw output.

crates/swc_plugin_runner/Cargo.toml

@@ -71,8 +71,7 @@ wasmer-cache              = { version = "3.3.0", optional = true }
 wasmer-compiler-cranelift = { version = "3.3.0", default-features = false }
 
 [dev-dependencies]
-cargo_metadata = "0.15.4"
-criterion      = "0.3"
+criterion = "0.3"
 
 swc_atoms = { version = "0.5.6", path = '../swc_atoms' }
 swc_css_ast = { version = "0.137.12", path = "../swc_css_ast", features = [

crates/swc_plugin_runner/tests/css_rkyv.rs

@@ -14,22 +14,14 @@ use swc_common::{
     collections::AHashMap, plugin::metadata::TransformPluginMetadataContext, sync::Lazy, FileName,
     Mark,
 };
+use testing::CARGO_TARGET_DIR;
 use tracing::info;
 
-static TARGET_DIR: Lazy<PathBuf> = Lazy::new(|| {
-    cargo_metadata::MetadataCommand::new()
-        .no_deps()
-        .exec()
-        .unwrap()
-        .target_directory
-        .into()
-});
-
 /// Returns the path to the built plugin
 fn build_plugin(dir: &Path) -> Result<PathBuf, Error> {
     {
         let mut cmd = Command::new("cargo");
-        cmd.env("CARGO_TARGET_DIR", &*TARGET_DIR);
+        cmd.env("CARGO_TARGET_DIR", &*CARGO_TARGET_DIR);
 
         cmd.current_dir(dir);
         cmd.args(["build", "--target=wasm32-wasi", "--release"])
@@ -45,7 +37,7 @@ fn build_plugin(dir: &Path) -> Result<PathBuf, Error> {
         }
     }
 
-    for entry in fs::read_dir(&TARGET_DIR.join("wasm32-wasi").join("release"))? {
+    for entry in fs::read_dir(&CARGO_TARGET_DIR.join("wasm32-wasi").join("release"))? {
         let entry = entry?;
 
         let s = entry.file_name().to_string_lossy().into_owned();

crates/swc_plugin_runner/tests/ecma_integration.rs

@@ -18,21 +18,13 @@ use swc_common::{
 use swc_ecma_ast::{CallExpr, Callee, EsVersion, Expr, Lit, MemberExpr, Program, Str};
 use swc_ecma_parser::{parse_file_as_program, Syntax};
 use swc_ecma_visit::{Visit, VisitWith};
-
-static TARGET_DIR: Lazy<PathBuf> = Lazy::new(|| {
-    cargo_metadata::MetadataCommand::new()
-        .no_deps()
-        .exec()
-        .unwrap()
-        .target_directory
-        .into()
-});
+use testing::CARGO_TARGET_DIR;
 
 /// Returns the path to the built plugin
 fn build_plugin(dir: &Path) -> Result<PathBuf, Error> {
     {
         let mut cmd = Command::new("cargo");
-        cmd.env("CARGO_TARGET_DIR", &*TARGET_DIR);
+        cmd.env("CARGO_TARGET_DIR", &*CARGO_TARGET_DIR);
         cmd.current_dir(dir);
         cmd.args(["build", "--target=wasm32-wasi"])
             .stderr(Stdio::inherit());
@@ -47,7 +39,7 @@ fn build_plugin(dir: &Path) -> Result<PathBuf, Error> {
         }
     }
 
-    for entry in fs::read_dir(&TARGET_DIR.join("wasm32-wasi").join("debug"))? {
+    for entry in fs::read_dir(&CARGO_TARGET_DIR.join("wasm32-wasi").join("debug"))? {
         let entry = entry?;
 
         let s = entry.file_name().to_string_lossy().into_owned();

crates/swc_plugin_runner/tests/ecma_rkyv.rs

@@ -16,22 +16,14 @@ use swc_common::{
 };
 use swc_ecma_ast::{EsVersion, Program};
 use swc_ecma_parser::{parse_file_as_program, Syntax, TsConfig};
+use testing::CARGO_TARGET_DIR;
 use tracing::info;
 
-static TARGET_DIR: Lazy<PathBuf> = Lazy::new(|| {
-    cargo_metadata::MetadataCommand::new()
-        .no_deps()
-        .exec()
-        .unwrap()
-        .target_directory
-        .into()
-});
-
 /// Returns the path to the built plugin
 fn build_plugin(dir: &Path) -> Result<PathBuf, Error> {
     {
         let mut cmd = Command::new("cargo");
-        cmd.env("CARGO_TARGET_DIR", &*TARGET_DIR);
+        cmd.env("CARGO_TARGET_DIR", &*CARGO_TARGET_DIR);
         cmd.current_dir(dir);
         cmd.args(["build", "--target=wasm32-wasi", "--release"])
             .stderr(Stdio::inherit());
@@ -46,7 +38,7 @@ fn build_plugin(dir: &Path) -> Result<PathBuf, Error> {
         }
     }
 
-    for entry in fs::read_dir(&TARGET_DIR.join("wasm32-wasi").join("release"))? {
+    for entry in fs::read_dir(&CARGO_TARGET_DIR.join("wasm32-wasi").join("release"))? {
         let entry = entry?;
 
         let s = entry.file_name().to_string_lossy().into_owned();

crates/swc_plugin_runner/tests/issues.rs

@@ -8,29 +8,20 @@ use std::{
 };
 
 use anyhow::{anyhow, Error};
-use once_cell::sync::Lazy;
 use serde_json::json;
 #[cfg(feature = "__rkyv")]
 use swc_common::plugin::serialized::PluginSerializedBytes;
 use swc_common::{collections::AHashMap, plugin::metadata::TransformPluginMetadataContext, Mark};
 use swc_ecma_ast::{CallExpr, Callee, EsVersion, Expr, Lit, MemberExpr, Program, Str};
 use swc_ecma_parser::{parse_file_as_program, Syntax};
 use swc_ecma_visit::Visit;
-
-static TARGET_DIR: Lazy<PathBuf> = Lazy::new(|| {
-    cargo_metadata::MetadataCommand::new()
-        .no_deps()
-        .exec()
-        .unwrap()
-        .target_directory
-        .into()
-});
+use testing::CARGO_TARGET_DIR;
 
 /// Returns the path to the built plugin
 fn build_plugin(dir: &Path, crate_name: &str) -> Result<PathBuf, Error> {
     {
         let mut cmd = Command::new("cargo");
-        cmd.env("CARGO_TARGET_DIR", &*TARGET_DIR);
+        cmd.env("CARGO_TARGET_DIR", &*CARGO_TARGET_DIR);
         cmd.current_dir(dir);
         cmd.args(["build", "--release", "--target=wasm32-wasi"])
             .stderr(Stdio::inherit());
@@ -45,7 +36,7 @@ fn build_plugin(dir: &Path, crate_name: &str) -> Result<PathBuf, Error> {
         }
     }
 
-    for entry in fs::read_dir(&TARGET_DIR.join("wasm32-wasi").join("release"))? {
+    for entry in fs::read_dir(&CARGO_TARGET_DIR.join("wasm32-wasi").join("release"))? {
         let entry = entry?;
 
         let s = entry.file_name().to_string_lossy().into_owned();

crates/testing/Cargo.toml

@@ -13,6 +13,7 @@ bench = false
 
 [dependencies]
 ansi_term          = "0.12.1"
+cargo_metadata     = "0.15.4"
 difference         = "2"
 once_cell          = "1.10.0"
 pretty_assertions  = "1.1"

crates/testing/src/lib.rs

@@ -309,3 +309,12 @@ pub fn unignore_fixture(fixture_path: &Path) {
 
     rename(fixture_path, &new_path).expect("failed to rename");
 }
+
+pub static CARGO_TARGET_DIR: Lazy<PathBuf> = Lazy::new(|| {
+    cargo_metadata::MetadataCommand::new()
+        .no_deps()
+        .exec()
+        .unwrap()
+        .target_directory
+        .into()
+});