diff --git a/tests/build.rs b/tests/build.rs index 024ae52..6e8f047 100644 --- a/tests/build.rs +++ b/tests/build.rs @@ -21,7 +21,7 @@ use rstest::rstest; /// Returns `Ok(())` if the test passes. #[rstest] fn build_without_clone() -> anyhow::Result<()> { - let mut cmd = Command::cargo_bin(common::ZKEVM_LLVM)?; + let mut cmd = Command::cargo_bin(common::ZKSYNC_LLVM)?; let file = assert_fs::NamedTempFile::new(common::LLVM_LOCK_FILE)?; let path = file.parent().expect("Lockfile parent dir does not exist"); cmd.current_dir(path); @@ -48,8 +48,8 @@ fn build_without_clone() -> anyhow::Result<()> { #[rstest] #[timeout(std::time::Duration::from_secs(5000))] fn clone_build_and_clean() -> anyhow::Result<()> { - let mut cmd = Command::cargo_bin(common::ZKEVM_LLVM)?; - let lockfile = common::create_test_tmp_lockfile(common::ERA_LLVM_REPO_TEST_REF)?; + let mut cmd = Command::cargo_bin(common::ZKSYNC_LLVM)?; + let lockfile = common::create_test_tmp_lockfile(None)?; let test_dir = lockfile .parent() .expect("Lockfile parent dir does not exist"); @@ -58,14 +58,14 @@ fn clone_build_and_clean() -> anyhow::Result<()> { cmd.assert() .success() .stderr(predicate::str::is_match(".*Updating files:.*100%.*done").unwrap()); - let mut build_cmd = Command::cargo_bin(common::ZKEVM_LLVM)?; + let mut build_cmd = Command::cargo_bin(common::ZKSYNC_LLVM)?; build_cmd.current_dir(test_dir); build_cmd .arg("build") .assert() .success() .stdout(predicate::str::is_match("Installing:.*").unwrap()); - let mut clean_cmd = Command::cargo_bin(common::ZKEVM_LLVM)?; + let mut clean_cmd = Command::cargo_bin(common::ZKSYNC_LLVM)?; clean_cmd.current_dir(test_dir); clean_cmd.arg("clean"); clean_cmd.assert().success(); @@ -88,8 +88,8 @@ fn clone_build_and_clean() -> anyhow::Result<()> { #[rstest] #[timeout(std::time::Duration::from_secs(5000))] fn clone_build_and_clean_musl() -> anyhow::Result<()> { - let mut cmd = Command::cargo_bin(common::ZKEVM_LLVM)?; - let lockfile = common::create_test_tmp_lockfile(common::ERA_LLVM_REPO_TEST_REF)?; + let mut cmd = Command::cargo_bin(common::ZKSYNC_LLVM)?; + let lockfile = common::create_test_tmp_lockfile(None)?; let test_dir = lockfile .parent() .expect("Lockfile parent dir does not exist"); @@ -98,7 +98,7 @@ fn clone_build_and_clean_musl() -> anyhow::Result<()> { cmd.assert() .success() .stderr(predicate::str::is_match(".*Updating files:.*100%.*done").unwrap()); - let mut build_cmd = Command::cargo_bin(common::ZKEVM_LLVM)?; + let mut build_cmd = Command::cargo_bin(common::ZKSYNC_LLVM)?; build_cmd.current_dir(test_dir); build_cmd .arg("build") @@ -107,7 +107,7 @@ fn clone_build_and_clean_musl() -> anyhow::Result<()> { .assert() .success() .stdout(predicate::str::is_match("Installing:.*").unwrap()); - let mut clean_cmd = Command::cargo_bin(common::ZKEVM_LLVM)?; + let mut clean_cmd = Command::cargo_bin(common::ZKSYNC_LLVM)?; clean_cmd.current_dir(test_dir); clean_cmd.arg("clean"); clean_cmd.assert().success(); @@ -130,8 +130,8 @@ fn clone_build_and_clean_musl() -> anyhow::Result<()> { #[rstest] #[timeout(std::time::Duration::from_secs(5000))] fn debug_build_with_tests_coverage() -> anyhow::Result<()> { - let mut cmd = Command::cargo_bin(common::ZKEVM_LLVM)?; - let lockfile = common::create_test_tmp_lockfile(common::ERA_LLVM_REPO_TEST_REF)?; + let mut cmd = Command::cargo_bin(common::ZKSYNC_LLVM)?; + let lockfile = common::create_test_tmp_lockfile(None)?; let test_dir = lockfile .parent() .expect("Lockfile parent dir does not exist"); @@ -140,7 +140,7 @@ fn debug_build_with_tests_coverage() -> anyhow::Result<()> { cmd.assert() .success() .stderr(predicate::str::is_match(".*Updating files:.*100%.*done").unwrap()); - let mut build_cmd = Command::cargo_bin(common::ZKEVM_LLVM)?; + let mut build_cmd = Command::cargo_bin(common::ZKSYNC_LLVM)?; build_cmd.current_dir(test_dir); build_cmd .arg("build") diff --git a/tests/checkout.rs b/tests/checkout.rs index aa1607c..65ee9fe 100644 --- a/tests/checkout.rs +++ b/tests/checkout.rs @@ -21,8 +21,8 @@ use rstest::rstest; /// Returns `Ok(())` if the test passes. #[rstest] fn checkout_after_clone() -> anyhow::Result<()> { - let mut cmd = Command::cargo_bin(common::ZKEVM_LLVM)?; - let lockfile = common::create_test_tmp_lockfile(common::ERA_LLVM_REPO_TEST_REF)?; + let mut cmd = Command::cargo_bin(common::ZKSYNC_LLVM)?; + let lockfile = common::create_test_tmp_lockfile(None)?; let test_dir = lockfile .parent() .expect("Lockfile parent dir does not exist"); @@ -31,16 +31,13 @@ fn checkout_after_clone() -> anyhow::Result<()> { cmd.assert() .success() .stderr(predicate::str::is_match(".*Updating files:.*100%.*done").unwrap()); - let mut checkout_cmd = Command::cargo_bin(common::ZKEVM_LLVM)?; + let mut checkout_cmd = Command::cargo_bin(common::ZKSYNC_LLVM)?; checkout_cmd.current_dir(test_dir); checkout_cmd.arg("checkout"); checkout_cmd .assert() .success() - .stderr(predicate::str::contains(format!( - "HEAD is now at {}", - &common::ERA_LLVM_REPO_TEST_REF[..8] - ))); + .stderr(predicate::str::contains("HEAD is now at")); Ok(()) } @@ -59,8 +56,8 @@ fn checkout_after_clone() -> anyhow::Result<()> { /// Returns `Ok(())` if the test passes. #[rstest] fn force_checkout() -> anyhow::Result<()> { - let mut cmd = Command::cargo_bin(common::ZKEVM_LLVM)?; - let lockfile = common::create_test_tmp_lockfile(common::ERA_LLVM_REPO_TEST_REF)?; + let mut cmd = Command::cargo_bin(common::ZKSYNC_LLVM)?; + let lockfile = common::create_test_tmp_lockfile(None)?; let test_dir = lockfile .parent() .expect("Lockfile parent dir does not exist"); @@ -69,16 +66,13 @@ fn force_checkout() -> anyhow::Result<()> { cmd.assert() .success() .stderr(predicate::str::is_match(".*Updating files:.*100%.*done").unwrap()); - let mut checkout_cmd = Command::cargo_bin(common::ZKEVM_LLVM)?; + let mut checkout_cmd = Command::cargo_bin(common::ZKSYNC_LLVM)?; checkout_cmd.current_dir(test_dir); checkout_cmd.arg("checkout").arg("--force"); checkout_cmd .assert() .success() - .stderr(predicate::str::contains(format!( - "HEAD is now at {}", - &common::ERA_LLVM_REPO_TEST_REF[..8] - ))); + .stderr(predicate::str::contains("HEAD is now at")); Ok(()) } @@ -97,7 +91,7 @@ fn force_checkout() -> anyhow::Result<()> { /// Returns `Ok(())` if the test passes. #[rstest] fn checkout_without_lockfile() -> anyhow::Result<()> { - let mut cmd = Command::cargo_bin(common::ZKEVM_LLVM)?; + let mut cmd = Command::cargo_bin(common::ZKSYNC_LLVM)?; let file = assert_fs::NamedTempFile::new(common::LLVM_LOCK_FILE)?; let path = file.parent().expect("Lockfile parent dir does not exist"); cmd.current_dir(path); diff --git a/tests/clean.rs b/tests/clean.rs index d21426e..2218f2d 100644 --- a/tests/clean.rs +++ b/tests/clean.rs @@ -21,7 +21,7 @@ use rstest::rstest; /// Returns `Ok(())` if the test passes. #[rstest] fn clean_without_clone() -> anyhow::Result<()> { - let mut cmd = Command::cargo_bin(common::ZKEVM_LLVM)?; + let mut cmd = Command::cargo_bin(common::ZKSYNC_LLVM)?; let file = assert_fs::NamedTempFile::new(common::LLVM_LOCK_FILE)?; let path = file.parent().expect("Lockfile parent dir does not exist"); cmd.current_dir(path); diff --git a/tests/clone.rs b/tests/clone.rs index e8b3d89..c58524f 100644 --- a/tests/clone.rs +++ b/tests/clone.rs @@ -21,8 +21,8 @@ use rstest::rstest; /// Returns `Ok(())` if the test passes. #[rstest] fn clone() -> anyhow::Result<()> { - let mut cmd = Command::cargo_bin(common::ZKEVM_LLVM)?; - let lockfile = common::create_test_tmp_lockfile(common::ERA_LLVM_REPO_TEST_REF)?; + let mut cmd = Command::cargo_bin(common::ZKSYNC_LLVM)?; + let lockfile = common::create_test_tmp_lockfile(None)?; let test_dir = lockfile .parent() .expect("Lockfile parent dir does not exist"); @@ -30,10 +30,7 @@ fn clone() -> anyhow::Result<()> { cmd.arg("clone"); cmd.assert() .success() - .stderr(predicate::str::contains(format!( - "HEAD is now at {}", - &common::ERA_LLVM_REPO_TEST_REF[..8] - ))); + .stderr(predicate::str::contains("HEAD is now at")); Ok(()) } @@ -52,8 +49,8 @@ fn clone() -> anyhow::Result<()> { /// Returns `Ok(())` if the test passes. #[rstest] fn clone_deep() -> anyhow::Result<()> { - let mut cmd = Command::cargo_bin(common::ZKEVM_LLVM)?; - let lockfile = common::create_test_tmp_lockfile(common::ERA_LLVM_REPO_TEST_REF)?; + let mut cmd = Command::cargo_bin(common::ZKSYNC_LLVM)?; + let lockfile = common::create_test_tmp_lockfile(None)?; let test_dir = lockfile .parent() .expect("Lockfile parent dir does not exist"); @@ -62,10 +59,7 @@ fn clone_deep() -> anyhow::Result<()> { cmd.arg("--deep"); cmd.assert() .success() - .stderr(predicate::str::contains(format!( - "HEAD is now at {}", - &common::ERA_LLVM_REPO_TEST_REF[..8] - ))); + .stderr(predicate::str::contains("HEAD is now at")); Ok(()) } @@ -84,8 +78,8 @@ fn clone_deep() -> anyhow::Result<()> { /// Returns `Ok(())` if the test passes. #[rstest] fn clone_wrong_reference() -> anyhow::Result<()> { - let mut cmd = Command::cargo_bin(common::ZKEVM_LLVM)?; - let lockfile = common::create_test_tmp_lockfile(common::ERA_LLVM_REPO_TEST_SHA_INVALID)?; + let mut cmd = Command::cargo_bin(common::ZKSYNC_LLVM)?; + let lockfile = common::create_test_tmp_lockfile(Some(common::ERA_LLVM_REPO_TEST_SHA_INVALID.to_string()))?; let test_dir = lockfile .parent() .expect("Lockfile parent dir does not exist"); @@ -112,7 +106,7 @@ fn clone_wrong_reference() -> anyhow::Result<()> { /// Returns `Ok(())` if the test passes. #[rstest] fn clone_without_lockfile() -> anyhow::Result<()> { - let mut cmd = Command::cargo_bin(common::ZKEVM_LLVM)?; + let mut cmd = Command::cargo_bin(common::ZKSYNC_LLVM)?; let file = assert_fs::NamedTempFile::new(common::LLVM_LOCK_FILE)?; let path = file.parent().expect("Lockfile parent dir does not exist"); cmd.current_dir(path); diff --git a/tests/common/mod.rs b/tests/common/mod.rs index cec5793..51f44b7 100644 --- a/tests/common/mod.rs +++ b/tests/common/mod.rs @@ -1,20 +1,19 @@ use assert_fs::fixture::FileWriteStr; -pub const ZKEVM_LLVM: &str = "zkevm-llvm"; +pub const ZKSYNC_LLVM: &str = "zksync-llvm"; pub const PACKAGE_VERSION: &str = env!("CARGO_PKG_VERSION"); pub const ERA_LLVM_REPO_URL: &str = "https://github.com/matter-labs/era-compiler-llvm"; pub const ERA_LLVM_REPO_TEST_BRANCH: &str = "v1.4.2"; -pub const ERA_LLVM_REPO_TEST_REF: &str = "b5ccf6d5774e9bc3cee47ab4a334404718d3adfd"; pub const ERA_LLVM_REPO_TEST_SHA_INVALID: &str = "12345abcd"; pub const LLVM_LOCK_FILE: &str = "LLVM.lock"; /// Creates a temporary lock file for testing. -pub fn create_test_tmp_lockfile(reference: &str) -> anyhow::Result { +pub fn create_test_tmp_lockfile(reference: Option) -> anyhow::Result { let file = assert_fs::NamedTempFile::new(LLVM_LOCK_FILE)?; let lock = compiler_llvm_builder::Lock { url: ERA_LLVM_REPO_URL.to_string(), branch: ERA_LLVM_REPO_TEST_BRANCH.to_string(), - r#ref: Some(reference.to_string()), + r#ref: reference, }; file.write_str(toml::to_string(&lock)?.as_str())?; Ok(file) diff --git a/tests/invalid_invocation.rs b/tests/invalid_invocation.rs index 21daaf7..8a86845 100644 --- a/tests/invalid_invocation.rs +++ b/tests/invalid_invocation.rs @@ -30,7 +30,7 @@ use rstest::rstest; #[case("clone", "--invalid-clone-option")] #[case("checkout", "--invalid-checkout-option")] fn invalid_option(#[case] subcommand: &str, #[case] option: &str) -> anyhow::Result<()> { - let mut cmd = Command::cargo_bin(common::ZKEVM_LLVM)?; + let mut cmd = Command::cargo_bin(common::ZKSYNC_LLVM)?; if subcommand != "" { cmd.arg(subcommand); } @@ -65,7 +65,7 @@ fn invalid_option(#[case] subcommand: &str, #[case] option: &str) -> anyhow::Res #[case("123")] #[case("$$.@!;-a3")] fn invalid_subcommand(#[case] subcommand: &str) -> anyhow::Result<()> { - let mut cmd = Command::cargo_bin(common::ZKEVM_LLVM)?; + let mut cmd = Command::cargo_bin(common::ZKSYNC_LLVM)?; cmd.arg(subcommand); cmd.assert() .failure() diff --git a/tests/version.rs b/tests/version.rs index 4fc645a..d0949a9 100644 --- a/tests/version.rs +++ b/tests/version.rs @@ -30,7 +30,7 @@ use rstest::rstest; #[case("clone")] #[case("checkout")] fn version(#[case] subcommand: String) -> anyhow::Result<()> { - let mut cmd = Command::cargo_bin(common::ZKEVM_LLVM)?; + let mut cmd = Command::cargo_bin(common::ZKSYNC_LLVM)?; if subcommand != "" { cmd.arg(subcommand); }