diff --git a/Cargo.toml b/Cargo.toml index eeec3b5..715f9a9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,7 +2,6 @@ members = [ "codegen-luajit", "codegen-luau", - "dev-fuzz", "dev-test", "wasm-ast", "wasm-synth" diff --git a/dev-fuzz/Cargo.toml b/dev-fuzz/Cargo.toml deleted file mode 100644 index cd739d7..0000000 --- a/dev-fuzz/Cargo.toml +++ /dev/null @@ -1,37 +0,0 @@ -[package] -name = "fuzz" -version = "0.0.0" -edition = "2021" -publish = false - -[package.metadata] -cargo-fuzz = true - -[dependencies] -libfuzzer-sys = "0.4" -wasm-smith = "0.8.0" - -[dependencies.parity-wasm] -git = "https://github.com/paritytech/parity-wasm.git" -features = ["multi_value", "sign_ext"] - -[dependencies.wasm-ast] -path = "../wasm-ast" - -[dependencies.codegen-luajit] -path = "../codegen-luajit" - -[dependencies.codegen-luau] -path = "../codegen-luau" - -[[bin]] -name = "luajit_translate" -path = "fuzz_targets/luajit_translate.rs" -test = false -doc = false - -[[bin]] -name = "luau_translate" -path = "fuzz_targets/luau_translate.rs" -test = false -doc = false diff --git a/dev-fuzz/.gitignore b/dev-test/.gitignore similarity index 100% rename from dev-fuzz/.gitignore rename to dev-test/.gitignore diff --git a/dev-test/Cargo.toml b/dev-test/Cargo.toml index 4303148..cf525ec 100644 --- a/dev-test/Cargo.toml +++ b/dev-test/Cargo.toml @@ -2,24 +2,34 @@ name = "dev-test" version = "0.1.0" edition = "2021" +publish = false -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html +[package.metadata] +cargo-fuzz = true -[dependencies.test-generator] -version = "0.3.0" - -[dependencies.wast] -version = "41.0.0" +[dependencies] +libfuzzer-sys = "0.4" +wasm-smith = "0.8.0" +wasm-ast = { path = "../wasm-ast" } +codegen-luajit = { path = "../codegen-luajit" } +codegen-luau = { path = "../codegen-luau" } [dependencies.parity-wasm] git = "https://github.com/paritytech/parity-wasm.git" features = ["multi_value", "sign_ext"] -[dependencies.wasm-ast] -path = "../wasm-ast" +[dev-dependencies] +test-generator = "0.3.0" +wast = "41.0.0" -[dependencies.codegen-luajit] -path = "../codegen-luajit" +[[bin]] +name = "luajit_translate" +path = "fuzz_targets/luajit_translate.rs" +test = false +doc = false -[dependencies.codegen-luau] -path = "../codegen-luau" +[[bin]] +name = "luau_translate" +path = "fuzz_targets/luau_translate.rs" +test = false +doc = false diff --git a/dev-fuzz/fuzz_targets/luajit_translate.rs b/dev-test/fuzz_targets/luajit_translate.rs similarity index 100% rename from dev-fuzz/fuzz_targets/luajit_translate.rs rename to dev-test/fuzz_targets/luajit_translate.rs diff --git a/dev-fuzz/fuzz_targets/luau_translate.rs b/dev-test/fuzz_targets/luau_translate.rs similarity index 100% rename from dev-fuzz/fuzz_targets/luau_translate.rs rename to dev-test/fuzz_targets/luau_translate.rs diff --git a/dev-test/src/lib.rs b/dev-test/tests/specification.rs similarity index 97% rename from dev-test/src/lib.rs rename to dev-test/tests/specification.rs index 95da7ee..f0a8a23 100644 --- a/dev-test/src/lib.rs +++ b/dev-test/tests/specification.rs @@ -117,6 +117,8 @@ fn parse_and_validate<'a>(buffer: &'a ParseBuffer) -> Option> { observer.then(|| loaded) } +static TEMP_DIR: &str = env!("CARGO_TARGET_TMPDIR"); + struct Tester { _marker: PhantomData, } @@ -124,7 +126,7 @@ struct Tester { impl Tester { fn test(name: &str, source: &str) -> IResult<()> { if let Some(data) = Self::run_generation(source)? { - let temp = std::env::temp_dir().join("wasm-test-".to_string() + name); + let temp = PathBuf::from(TEMP_DIR).join("west-".to_string() + name); std::fs::write(&temp, &data)?; Self::run_command(&temp)?;