From bd03af18b5daf9540cc4b1dac56501ecca48e4b1 Mon Sep 17 00:00:00 2001 From: Michael Vines Date: Thu, 5 Nov 2020 13:09:04 -0800 Subject: [PATCH] Exclude associated-token-account/program from workspace until cargo test works for it --- Cargo.toml | 2 +- associated-token-account/program/Cargo.toml | 2 ++ associated-token-account/program/build.rs | 21 --------------------- 3 files changed, 3 insertions(+), 22 deletions(-) delete mode 100644 associated-token-account/program/build.rs diff --git a/Cargo.toml b/Cargo.toml index cb79d890..b615b1b6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,5 @@ [workspace] members = [ - "associated-token-account/program", "memo/program", "shared-memory/program", "stake-pool/program", @@ -15,5 +14,6 @@ members = [ "utils/test-client", ] exclude = [ + "associated-token-account/program", # Exclude until `cargo test` works "themis/client_ristretto", ] diff --git a/associated-token-account/program/Cargo.toml b/associated-token-account/program/Cargo.toml index 41aabfb3..1386ceb2 100644 --- a/associated-token-account/program/Cargo.toml +++ b/associated-token-account/program/Cargo.toml @@ -24,3 +24,5 @@ crate-type = ["cdylib", "lib"] [package.metadata.docs.rs] targets = ["x86_64-unknown-linux-gnu"] + +[workspace] diff --git a/associated-token-account/program/build.rs b/associated-token-account/program/build.rs deleted file mode 100644 index c162da37..00000000 --- a/associated-token-account/program/build.rs +++ /dev/null @@ -1,21 +0,0 @@ -use std::process::{exit, Command}; - -fn main() { - if std::env::var("XARGO").is_err() - && std::env::var("RUSTC_WRAPPER").is_err() - && std::env::var("RUSTC_WORKSPACE_WRAPPER").is_err() - { - println!( - "cargo:warning=(not a warning) Building BPF {} program", - std::env::var("CARGO_PKG_NAME").unwrap() - ); - if !Command::new("cargo") - .arg("build-bpf") - .status() - .expect("Failed to build bpf") - .success() - { - exit(1); - } - } -}