route fixtures into conformance instead of direct invoke

Author: buffalojoec

scripts/ci/fd-conformance.mjs

@@ -31,6 +31,10 @@ 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 core-bpf-conformance http://github.com/buffalojoec/solfuzz-agave.git ${solFuzzAgavePath}`;
@@ -90,28 +94,3 @@ if (fs.existsSync('test_results/failed_protobufs')) {
 
 console.log('All Firedancer conformance tests passed.');
 
-// Build the Agave target with the BPF version, this time without any
-// conformance special-casing (just the `core-bpf` feature).
-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`;
-await $`mv ${solFuzzAgaveTargetPath} ${testTargetPathCoreBpf}`;
-
-// Now run the conformance harness on just the BPF program with the fixtures
-// generated by Mollusk in the program's `fuzz/blob` directory.
-const molluskFixturesPath = path.join(workingDirectory, 'program', 'fuzz', 'blob');
-const result = await $`source test_suite_env/bin/activate && \
-        solana-test-suite exec-fixtures \
-        -i ${molluskFixturesPath} \
-        -t ${testTargetPathCoreBpf}`;
-
-// Assert conformance.
-// There should be no "Failed tests:" section in the output.
-if (/Failed tests:/.test(result.stdout.split('\n').slice(-2).join('\n'))) {
-    console.error("Error: Some Mollusk-generated fixture executions failed.");
-    process.exit(1);
-} else {
-    console.log('All Mollusk-generated fixture executions passed.');
-}