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.

Sign up for GitHub

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

ci: route mollusk fixtures into fd conformance #29

Merged
merged 3 commits into from
Dec 5, 2024
+10 −4
Merged

ci: route mollusk fixtures into fd conformance #29

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
32feda1
ci: route mollusk fixtures into fd conformance
buffalojoec Nov 25, 2024
1a8d65c
route fixtures into conformance instead of direct invoke
buffalojoec Nov 27, 2024
090295e
switch back to firedancer repo
buffalojoec Dec 5, 2024
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
14 changes: 10 additions & 4 deletions scripts/ci/fd-conformance.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,13 @@ for (const fixture of skipFixtures) {
await $`rm -f ${path.join(fixturesPath, fixture)}`;
}

// Add the Mollusk-generated fixtures to the test inputs.
const molluskFixturesPath = path.join(workingDirectory, 'program', 'fuzz', 'blob');
await $`cp -a ${molluskFixturesPath}/. ${fixturesPath}/`;

// Clone the SolFuzz-Agave harness.
const solFuzzAgavePath = path.join(harnessPath, 'impl', 'solfuzz-agave');
await $`git clone -b agave-v2.1.0 http://github.com/firedancer-io/solfuzz-agave.git ${solFuzzAgavePath}`;
await $`git clone -b agave-v2.1.3 http://github.com/firedancer-io/solfuzz-agave.git ${solFuzzAgavePath}`;

// Fetch protobuf files.
await $`make -j -C ${solFuzzAgavePath} fetch_proto`
Expand Down Expand Up @@ -62,13 +66,15 @@ await $`cargo build --manifest-path ${solFuzzAgaveManifestPath} \
--lib --release --target x86_64-unknown-linux-gnu`;
await $`mv ${solFuzzAgaveTargetPath} ${testTargetPathBuiltin}`;

// Build the Agave target with the BPF version.
// Build the Agave target with the BPF version and special-casing enabled for
// conformance testing (`core-bpf-conformance` features).
const testTargetPathCoreBpf = path.join(testTargetsDir, 'core_bpf.so');
await $`CORE_BPF_PROGRAM_ID=${getProgramId('program')} \
CORE_BPF_TARGET=${getProgramSharedObjectPath('program')} \
FORCE_RECOMPILE=true \
cargo build --manifest-path ${solFuzzAgaveManifestPath} \
--lib --release --target x86_64-unknown-linux-gnu --features core-bpf`;
--lib --release --target x86_64-unknown-linux-gnu \
--features core-bpf-conformance`;
await $`mv ${solFuzzAgaveTargetPath} ${testTargetPathCoreBpf}`;

// Remove any test results if they exist.
Expand All @@ -87,4 +93,4 @@ if (fs.existsSync('test_results/failed_protobufs')) {
}
}

console.log('All tests passed.');
console.log('All Firedancer conformance tests passed.');
Loading