From 67b5aecba645c204e64437121eeaec0d9d34eb72 Mon Sep 17 00:00:00 2001 From: Kunal Bhargava Date: Wed, 4 Sep 2024 22:42:00 +0000 Subject: [PATCH] add env var defaults --- commands.md | 8 ++++---- src/test_suite/test_suite.py | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/commands.md b/commands.md index fffb517..b20968d 100644 --- a/commands.md +++ b/commands.md @@ -41,8 +41,8 @@ $ solana-test-suite create-fixtures [OPTIONS] **Options**: * `-i, --input-dir PATH`: Either a file or directory containing InstrContext messages [default: corpus8] -* `-s, --solana-target PATH`: Solana (or ground truth) shared object (.so) target file path [default: impl/lib/libsolfuzz_agave_v2.0.so] -* `-t, --target PATH`: Shared object (.so) target file paths (pairs with --keep-passing). Targets must have sol_compat_instr_execute_v1 defined +* `-s, --solana-target PATH`: Solana (or ground truth) shared object (.so) target file path [default: /home/kbhargava/repos/solfuzz-agave/target/release/libsolfuzz_agave.so] +* `-t, --target PATH`: Shared object (.so) target file paths (pairs with --keep-passing). Targets must have sol_compat_instr_execute_v1 defined [default: /home/kbhargava/repos/firedancer/build/native/gcc/lib/libfd_exec_sol_compat.so] * `-o, --output-dir PATH`: Output directory for fixtures [default: test_fixtures] * `-p, --num-processes INTEGER`: Number of processes to use [default: 4] * `-r, --readable`: Output fixtures in human-readable format @@ -166,8 +166,8 @@ $ solana-test-suite run-tests [OPTIONS] **Options**: * `-i, --input PATH`: Single input file or input directory containing InstrContext or InstrFixture messages [default: corpus8] -* `-s, --solana-target PATH`: Solana (or ground truth) shared object (.so) target file path [default: impl/lib/libsolfuzz_agave_v2.0.so] -* `-t, --target PATH`: Shared object (.so) target file paths [default: impl/lib/libsolfuzz_firedancer.so] +* `-s, --solana-target PATH`: Solana (or ground truth) shared object (.so) target file path [default: /home/kbhargava/repos/solfuzz-agave/target/release/libsolfuzz_agave.so] +* `-t, --target PATH`: Shared object (.so) target file paths [default: /home/kbhargava/repos/firedancer/build/native/gcc/lib/libfd_exec_sol_compat.so] * `-o, --output-dir PATH`: Output directory for test results [default: test_results] * `-p, --num-processes INTEGER`: Number of processes to use [default: 4] * `-r, --randomize-output-buffer`: Randomizes bytes in output buffer before shared library execution diff --git a/src/test_suite/test_suite.py b/src/test_suite/test_suite.py index 4d9f412..5cf02e8 100644 --- a/src/test_suite/test_suite.py +++ b/src/test_suite/test_suite.py @@ -192,13 +192,13 @@ def create_fixtures( help=f"Either a file or directory containing {globals.harness_ctx.context_type.__name__} messages", ), solana_shared_library: Path = typer.Option( - Path("impl/lib/libsolfuzz_agave_v2.0.so"), + Path(os.getenv("SOLFUZZ_TARGET", "impl/lib/libsolfuzz_agave_v2.0.so")), "--solana-target", "-s", help="Solana (or ground truth) shared object (.so) target file path", ), shared_libraries: List[Path] = typer.Option( - [], + [Path(os.getenv("FIREDANCER_TARGET", "impl/lib/libsolfuzz_firedancer.so"))], "--target", "-t", help="Shared object (.so) target file paths (pairs with --keep-passing)." @@ -290,13 +290,13 @@ def run_tests( f" or { globals.harness_ctx.fixture_type.__name__ } messages", ), solana_shared_library: Path = typer.Option( - Path("impl/lib/libsolfuzz_agave_v2.0.so"), + Path(os.getenv("SOLFUZZ_TARGET", "impl/lib/libsolfuzz_agave_v2.0.so")), "--solana-target", "-s", help="Solana (or ground truth) shared object (.so) target file path", ), shared_libraries: List[Path] = typer.Option( - [Path("impl/lib/libsolfuzz_firedancer.so")], + [Path(os.getenv("FIREDANCER_TARGET", "impl/lib/libsolfuzz_firedancer.so"))], "--target", "-t", help="Shared object (.so) target file paths", @@ -523,13 +523,13 @@ def list_harness_types(): ) def debug_mismatches( solana_shared_library: Path = typer.Option( - Path(os.getenv("SOLFUZZ_TARGET", "")), + Path(os.getenv("SOLFUZZ_TARGET", "impl/lib/libsolfuzz_agave_v2.0.so")), "--solana-target", "-s", help="Solana (or ground truth) shared object (.so) target file path", ), shared_libraries: List[Path] = typer.Option( - [Path(os.getenv("FIREDANCER_TARGET", ""))], + [Path(os.getenv("FIREDANCER_TARGET", "impl/lib/libsolfuzz_firedancer.so"))], "--target", "-t", help="Shared object (.so) target file paths (pairs with --keep-passing)."