Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update patches #360

Merged
merged 4 commits into from
Feb 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ jobs:

- name: Dylint
run: |
cargo install cargo-dylint --git=https://github.com/trailofbits/dylint --no-default-features --features=metadata-cli || true
cargo install cargo-dylint --git=https://github.com/trailofbits/dylint --no-default-features --features=cargo-cli || true
cargo install dylint-link || true
./scripts/dylint.sh

Expand Down Expand Up @@ -138,6 +138,14 @@ jobs:
cargo install cargo-unmaintained || true
cargo install group-runner || true

- name: Free up space
run: |
# https://github.com/actions/runner-images/issues/2606#issuecomment-772683150
sudo rm -rf /usr/local/lib/android
sudo rm -rf /usr/share/dotnet
sudo rm -rf /usr/share/swift
# du -sh /usr/*/* 2>/dev/null | sort -h || true

- name: Setup
run: |
SERDE_FORMAT='--features=test-fuzz/serde_${{ matrix.serde_format }}'
Expand Down
4 changes: 2 additions & 2 deletions cargo-test-fuzz/patches/solana.patch
Original file line number Diff line number Diff line change
Expand Up @@ -156,10 +156,10 @@ index 48d771b..1d1d527 100644
[dev-dependencies]
assert_matches = { workspace = true }
diff --git a/programs/bpf_loader/src/lib.rs b/programs/bpf_loader/src/lib.rs
index 48d44b7..5d1380f 100644
index 21a7b5f..ad85633 100644
--- a/programs/bpf_loader/src/lib.rs
+++ b/programs/bpf_loader/src/lib.rs
@@ -370,6 +370,7 @@ declare_builtin_function!(
@@ -368,6 +368,7 @@ declare_builtin_function!(
);

-pub fn process_instruction_inner(
Expand Down
15 changes: 12 additions & 3 deletions cargo-test-fuzz/tests/third_party.rs
Original file line number Diff line number Diff line change
Expand Up @@ -44,19 +44,23 @@ static TESTS: Lazy<Vec<Test>> = Lazy::new(|| {
// smoelius: This should match `scripts/update_patches.sh`.
const LINES_OF_CONTEXT: u32 = 2;

#[cfg_attr(dylint_lib = "supplementary", allow(commented_code))]
mod cheap_tests {
use super::*;

#[cfg_attr(dylint_lib = "supplementary", allow(commented_code))]
#[test]
fn test() {
let version_meta = version_meta().unwrap();
for test in TESTS.iter() {
#[allow(clippy::nonminimal_bool)]
run_test(
module_path!(),
test,
test.flags.contains(Flags::EXPENSIVE)
// || test.flags.contains(Flags::SKIP)
|| (test.flags.contains(Flags::SKIP_NIGHTLY)
// smoelius: Temporarily disable all nightly third-party tests.
// See: https://github.com/tkaitchuck/aHash/issues/200
|| (true // test.flags.contains(Flags::SKIP_NIGHTLY)
&& version_meta.channel == Channel::Nightly),
);
}
Expand All @@ -65,16 +69,21 @@ mod cheap_tests {

mod all_tests {
use super::*;

#[cfg_attr(dylint_lib = "supplementary", allow(commented_code))]
#[test]
#[ignore]
fn test() {
let version_meta = version_meta().unwrap();
for test in TESTS.iter() {
#[allow(clippy::nonminimal_bool)]
run_test(
module_path!(),
test,
// test.flags.contains(Flags::SKIP) ||
test.flags.contains(Flags::SKIP_NIGHTLY)
// smoelius: Temporarily disable all nightly third-party tests.
// See: https://github.com/tkaitchuck/aHash/issues/200
true // test.flags.contains(Flags::SKIP_NIGHTLY)
&& version_meta.channel == Channel::Nightly,
);
}
Expand Down
4 changes: 2 additions & 2 deletions cargo-test-fuzz/third_party.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
{
"flags": ["EXPENSIVE"],
"url": "https://github.com/paritytech/polkadot-sdk",
"rev": "b177c2860e6d75d189e66185954a283db000f7ef",
"rev": "2556e33fb4c52ea8192de68df33c151768edc2a9",
"patch": "substrate_client_transaction_pool.patch",
"subdir": ".",
"package": "sc-transaction-pool",
Expand All @@ -38,7 +38,7 @@
{
"flags": ["EXPENSIVE"],
"url": "https://github.com/solana-labs/solana",
"rev": "056930483531424f2ef584be8aeaa1cee56b0db7",
"rev": "28a320d81571f776c439a4090aedcceffaf5fbbb",
"patch": "solana.patch",
"subdir": ".",
"package": "solana-bpf-loader-program",
Expand Down