Skip to content

Commit 16dc21f

Browse files
committed
Update dependencies and bump platform-tools version
1 parent b550081 commit 16dc21f

File tree

5 files changed

+29
-26
lines changed

5 files changed

+29
-26
lines changed

.github/workflows/build-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
build:
1010
runs-on: ubuntu-20.04
1111
steps:
12-
- uses: actions/checkout@v2
12+
- uses: actions/checkout@v3
1313

1414
- name: Run clippy
1515
run: cargo clippy

Cargo.lock

Lines changed: 12 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
[package]
2-
name = "run-sbf-tests"
2+
name = "run-solana-tests"
33
description = "Blockchain, Rebuilt for Scale"
44
version = "1.15.0"
55
documentation = "https://docs.rs/solana"
66
homepage = "https://solana.com/"
77
readme = "README.md"
8-
repository = "https://github.com/solana-labs/cargo-run-sbf-tests"
8+
repository = "https://github.com/solana-labs/cargo-run-solana-tests"
99
authors = ["Solana Maintainers <[email protected]>"]
1010
license = "Apache-2.0"
1111
edition = "2018"
@@ -25,5 +25,5 @@ solana_rbpf = "=0.2.39"
2525
targets = ["x86_64-unknown-linux-gnu"]
2626

2727
[[bin]]
28-
name = "cargo-run-sbf-tests"
28+
name = "cargo-run-solana-tests"
2929
path = "src/main.rs"

README.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
1-
cargo-run-bpf-tests
2-
===================
1+
cargo-run-solana-tests
2+
======================
3+
4+
A tool to run Solana on-chain test programs in a controlled
5+
environment.

src/main.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,8 @@ fn llvm_home() -> Result<PathBuf, anyhow::Error> {
8181
Ok(home_dir
8282
.join(".cache")
8383
.join("solana")
84-
.join("v1.32")
85-
.join("sbf-tools")
84+
.join("v1.35")
85+
.join("platform-tools")
8686
.join("llvm"))
8787
}
8888

@@ -107,7 +107,7 @@ fn remove_bss_sections(module: &Path) -> Result<(), anyhow::Error> {
107107
Ok(())
108108
}
109109

110-
// Execute the given test file in RSBF.
110+
// Execute the given test file in Solana VM.
111111
fn run_tests(opt: Opt) -> Result<(), anyhow::Error> {
112112
let path = opt.file.with_extension("so");
113113
let loader_id = bpf_loader::id();
@@ -277,14 +277,14 @@ fn run_tests(opt: Opt) -> Result<(), anyhow::Error> {
277277

278278
#[derive(Debug, StructOpt)]
279279
#[structopt(
280-
name = "cargo-run-sbf-tests",
281-
about = "Test runner for the sbf-solana-solana target"
280+
name = "cargo-run-solana-tests",
281+
about = "Test runner for the Solana Virtual Machine target"
282282
)]
283283
struct Opt {
284284
#[allow(dead_code)]
285285
#[structopt(long, hidden = true)]
286286
quiet: bool,
287-
/// RBPF heap size
287+
/// Solana VM heap size
288288
#[structopt(long)]
289289
heap_size: Option<usize>,
290290
#[structopt(short)]
@@ -297,8 +297,8 @@ fn main() {
297297
solana_logger::setup();
298298

299299
let mut args = env::args().collect::<Vec<_>>();
300-
if let Some("run-sbf-tests") = args.get(1).map(|a| a.as_str()) {
301-
// we're being invoked as `cargo run-sbf-tests`
300+
if let Some("run-solana-tests") = args.get(1).map(|a| a.as_str()) {
301+
// we're being invoked as `cargo run-solana-tests`
302302
args.remove(1);
303303
}
304304

0 commit comments

Comments
 (0)