Pull all the Rust BPF tests into a single workspace so they share dependencies (#5878)

2019-09-11 14:55:58 -07:00
parent a85604b2ba
commit 176c7d8b13
20 changed files with 1887 additions and 104 deletions
--- a/programs/bpf/rust/128bit/Cargo.toml
+++ b/programs/bpf/rust/128bit/Cargo.toml
@ -19,9 +19,6 @@ solana-bpf-rust-128bit-dep = { path = "../128bit_dep", version = "0.19.0-pre0" }
 program = ["solana-sdk/program"]
 default = ["program"]

-[workspace]
-members = []
-
 [lib]
 crate-type = ["cdylib"]
 name = "solana_bpf_rust_128bit"
--- a/programs/bpf/rust/128bit_dep/Cargo.toml
+++ b/programs/bpf/rust/128bit_dep/Cargo.toml
@ -16,7 +16,4 @@ solana-sdk = { path = "../../../../sdk/", version = "0.19.0-pre0", default-featu

 [features]
 program = ["solana-sdk/program"]
-default = ["program"]
-
-[workspace]
-members = []
+default = ["program"]
--- a/programs/bpf/rust/alloc/Cargo.toml
+++ b/programs/bpf/rust/alloc/Cargo.toml
@ -18,9 +18,6 @@ solana-sdk = { path = "../../../../sdk/", version = "0.19.0-pre0", default-featu
 program = ["solana-sdk/program"]
 default = ["program"]

-[workspace]
-members = []
-
 [lib]
 crate-type = ["cdylib"]
 name = "solana_bpf_rust_alloc"
--- a/programs/bpf/rust/dep_crate/Cargo.toml
+++ b/programs/bpf/rust/dep_crate/Cargo.toml
@ -19,9 +19,6 @@ solana-sdk = { path = "../../../../sdk/", version = "0.19.0-pre0", default-featu
 program = ["solana-sdk/program"]
 default = ["program"]

-[workspace]
-members = []
-
 [lib]
 crate-type = ["cdylib"]
 name = "solana_bpf_rust_dep_crate"
--- a/programs/bpf/rust/do.sh
+++ b/programs/bpf/rust/do.sh
@ -20,14 +20,18 @@ Supported actions:
 EOF
 }

+sdkDir=../../..
+targetDir=../../target
+profile=bpfel-unknown-unknown/release
+
 perform_action() {
    set -e
    case "$1" in
    build)
-         ./../../../sdk/bpf/rust/build.sh "$2"
+         "$sdkDir"/sdk/bpf/rust/build.sh "$2"
        ;;
    clean)
-         ./../../../sdk/bpf/rust/clean.sh "$2"
+         "$sdkDir"/sdk/bpf/rust/clean.sh "$2"
        ;;
    test)
        (
@ -57,34 +61,29 @@ perform_action() {
        # - rustfilt
        (
            pwd
-            ./do.sh clean "$3"
            ./do.sh build "$3"

            cd "$3"

-            set +e
-            cp ./target/dump.txt ./targetdump-last.txt 2>/dev/null
-            set -e
-
            ls \
                -la \
-                ./target/bpfel-unknown-unknown/release/solana_bpf_rust_"${3%/}".so \
-                > ./target/dump_mangled.txt
+                "$targetDir"/"$profile"/solana_bpf_rust_"${3%/}".so \
+                > "$targetDir"/"${3%/}"-dump-mangled.txt
            greadelf \
                -aW \
-                ./target/bpfel-unknown-unknown/release/solana_bpf_rust_"${3%/}".so \
-                >> ./target/dump_mangled.txt
+                "$targetDir"/"$profile"/solana_bpf_rust_"${3%/}".so \
+                >> "$targetDir"/"${3%/}"-dump-mangled.txt
            llvm-objdump \
                -print-imm-hex \
                --source \
                --disassemble \
-                ./target/bpfel-unknown-unknown/release/solana_bpf_rust_"${3%/}".so \
-                >> ./target/dump_mangled.txt
+                "$targetDir"/"$profile"/solana_bpf_rust_"${3%/}".so \
+                >> "$targetDir"/"${3%/}"-dump-mangled.txt
            sed \
                s/://g \
-                < ./target/dump_mangled.txt \
+                < "$targetDir"/"${3%/}"-dump-mangled.txt \
                | rustfilt \
-                > ./target/dump.txt
+                > "$targetDir"/"${3%/}"-dump.txt
        )
        ;;
    help)
--- a/programs/bpf/rust/external_spend/Cargo.toml
+++ b/programs/bpf/rust/external_spend/Cargo.toml
@ -18,9 +18,6 @@ solana-sdk = { path = "../../../../sdk/", version = "0.19.0-pre0", default-featu
 program = ["solana-sdk/program"]
 default = ["program"]

-[workspace]
-members = []
-
 [lib]
 crate-type = ["cdylib"]
 name = "solana_bpf_rust_external_spend"
--- a/programs/bpf/rust/iter/Cargo.toml
+++ b/programs/bpf/rust/iter/Cargo.toml
@ -18,9 +18,6 @@ solana-sdk = { path = "../../../../sdk/", version = "0.19.0-pre0", default-featu
 program = ["solana-sdk/program"]
 default = ["program"]

-[workspace]
-members = []
-
 [lib]
 crate-type = ["cdylib"]
 name = "solana_bpf_rust_iter"
--- a/programs/bpf/rust/many_args/Cargo.toml
+++ b/programs/bpf/rust/many_args/Cargo.toml
@ -19,9 +19,6 @@ solana-bpf-rust-many-args-dep = { path = "../many_args_dep", version = "0.19.0-p
 program = ["solana-sdk/program"]
 default = ["program"]

-[workspace]
-members = []
-
 [lib]
 crate-type = ["cdylib"]
 name = "solana_bpf_rust_many_args"
--- a/programs/bpf/rust/many_args_dep/Cargo.toml
+++ b/programs/bpf/rust/many_args_dep/Cargo.toml
@ -16,7 +16,4 @@ solana-sdk = { path = "../../../../sdk/", version = "0.19.0-pre0", default-featu

 [features]
 program = ["solana-sdk/program"]
-default = ["program"]
-
-[workspace]
-members = []
+default = ["program"]
--- a/programs/bpf/rust/noop/Cargo.toml
+++ b/programs/bpf/rust/noop/Cargo.toml
@ -18,9 +18,6 @@ solana-sdk = { path = "../../../../sdk/", version = "0.19.0-pre0", default-featu
 program = ["solana-sdk/program"]
 default = ["program"]

-[workspace]
-members = []
-
 [lib]
 crate-type = ["cdylib"]
 name = "solana_bpf_rust_noop"
--- a/programs/bpf/rust/panic/Cargo.toml
+++ b/programs/bpf/rust/panic/Cargo.toml
@ -18,9 +18,6 @@ solana-sdk = { path = "../../../../sdk/", version = "0.19.0-pre0", default-featu
 program = ["solana-sdk/program"]
 default = ["program"]

-[workspace]
-members = []
-
 [lib]
 name = "solana_bpf_rust_panic"
 crate-type = ["cdylib"]
--- a/programs/bpf/rust/param_passing/Cargo.toml
+++ b/programs/bpf/rust/param_passing/Cargo.toml
@ -19,9 +19,6 @@ solana-bpf-rust-param-passing-dep = { path = "../param_passing_dep", version = "
 program = ["solana-sdk/program"]
 default = ["program"]

-[workspace]
-members = []
-
 [lib]
 crate-type = ["cdylib"]
 name = "solana_bpf_rust_param_passing"
--- a/programs/bpf/rust/param_passing_dep/Cargo.toml
+++ b/programs/bpf/rust/param_passing_dep/Cargo.toml
@ -17,6 +17,3 @@ solana-sdk = { path = "../../../../sdk/", version = "0.19.0-pre0", default-featu
 [features]
 program = ["solana-sdk/program"]
 default = ["program"]
-
-[workspace]
-members = []
--- a/programs/bpf/rust/sysval/Cargo.toml
+++ b/programs/bpf/rust/sysval/Cargo.toml
@ -18,9 +18,6 @@ solana-sdk = { path = "../../../../sdk/", version = "0.19.0-pre0", default-featu
 program = ["solana-sdk/program"]
 default = ["program"]

-[workspace]
-members = []
-
 [lib]
 crate-type = ["cdylib"]
 name = "solana_bpf_rust_sysval"