Skip to content

Commit

Permalink
run all tests; exclude them from cmake
Browse files Browse the repository at this point in the history
  • Loading branch information
AndreyMlashkin committed Jun 4, 2024
1 parent 434cc19 commit 7099ebe
Show file tree
Hide file tree
Showing 2 changed files with 56 additions and 14 deletions.
66 changes: 54 additions & 12 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,60 @@
};

testList = [
"blueprint_algebra_fields_plonk_exponentiation_test"
"blueprint_algebra_curves_plonk_unified_addition_test"
"blueprint_algebra_curves_plonk_variable_base_scalar_mul_test"
"blueprint_verifiers_kimchi_sponge_oracles_test"
"blueprint_hashes_plonk_poseidon_test"
"blueprint_algebra_curves_plonk_endo_scalar_test"
"blueprint_algebra_fields_plonk_range_check_test"
"blueprint_algebra_fields_plonk_logic_and_flag_test"
"blueprint_algebra_fields_plonk_logic_or_flag_test"
"blueprint_algebra_fields_plonk_interpolation_test"
"blueprint_algebra_fields_plonk_non_native_addition_test"
"blueprint_algebra_fields_plonk_non_native_subtraction_test"
"blueprint_algebra_fields_plonk_non_native_range_test"
"blueprint_algebra_fields_plonk_non_native_reduction_test"
"blueprint_algebra_fields_plonk_non_native_bit_decomposition_test"
"blueprint_algebra_fields_plonk_non_native_bit_composition_test"
"blueprint_algebra_fields_plonk_non_native_bit_shift_constant_test"
"blueprint_algebra_fields_plonk_non_native_logic_ops_test"
"blueprint_algebra_fields_plonk_non_native_lookup_logic_ops_test"
"blueprint_algebra_fields_plonk_non_native_comparison_checked_test"
"blueprint_algebra_fields_plonk_non_native_comparison_unchecked_test"
"blueprint_algebra_fields_plonk_non_native_comparison_flag_test"
"blueprint_algebra_fields_plonk_non_native_equality_flag_test"
"blueprint_algebra_fields_plonk_non_native_division_remainder_test"
#"blueprint_non_native_plonk_scalar_non_native_range_test"
"blueprint_non_native_plonk_bool_scalar_multiplication_test"
#"blueprint_non_native_plonk_add_mul_zkllvm_compatible_test"
"blueprint_hashes_plonk_decomposition_test"
"blueprint_verifiers_placeholder_fri_cosets_test"
"blueprint_hashes_plonk_sha256_process_test"
"blueprint_hashes_plonk_sha512_process_test"
"blueprint_hashes_plonk_sha256_test"
"blueprint_hashes_plonk_sha512_test"
"blueprint_algebra_fields_plonk_sqrt_test"
"blueprint_verifiers_placeholder_fri_lin_inter_test"
"blueprint_verifiers_placeholder_fri_array_swap_test"
"blueprint_manifest_test"
"blueprint_detail_huang_lu_test"
"blueprint_private_input_test"
"blueprint_verifiers_placeholder_permutation_argument_verifier_test"
"blueprint_verifiers_placeholder_gate_argument_verifier_test"
"blueprint_verifiers_placeholder_lookup_argument_verifier_test"
"blueprint_verifiers_placeholder_f1_loop_test"
"blueprint_verifiers_placeholder_f3_loop_test"
"blueprint_verifiers_placeholder_gate_component_test"
"blueprint_verifiers_flexible_pow_factor_test"
"blueprint_proxy_test"
#"blueprint_mock_mocked_components_test"
"blueprint_component_batch_test"
"blueprint_verifiers_placeholder_expression_evaluation_component_test"
"blueprint_verifiers_placeholder_final_polynomial_check_test"
"blueprint_verifiers_flexible_swap_test"
"blueprint_verifiers_flexible_additions_test"
"blueprint_verifiers_flexible_multiplications_test"
"blueprint_verifiers_flexible_poseidon_test"
"blueprint_verifiers_flexible_constant_pow_test"
"blueprint_verifiers_placeholder_verifier_test"
Expand Down Expand Up @@ -91,19 +145,7 @@
doCheck = true;

ninjaFlags = pkgs.lib.strings.concatStringsSep " " testList;


checkPhase =
let
runTest = testName: "echo 'Running ${testName}' && ./test/${testName}";
commandList = builtins.map runTest testList;
in ''
export BOOST_TEST_LOGGER=JUNIT:HRF
${pkgs.lib.strings.concatStringsSep "\n" commandList}
mkdir -p ${placeholder "out"}/test-logs
find .. -type f -name '*_test.xml' -exec cp {} ${placeholder "out"}/test-logs \;
'';

dontInstall = true;
};
};
Expand Down
4 changes: 2 additions & 2 deletions test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ set(COMMON_TEST_FILES
"utils/connectedness_check"
"private_input"
"proxy"
"mock/mocked_components"
#"mock/mocked_components"
"component_batch"
)

Expand All @@ -77,7 +77,7 @@ set(NON_NATIVE_TESTS_FILES
"algebra/fields/plonk/non_native/equality_flag"
"algebra/fields/plonk/non_native/division_remainder"
"non_native/plonk/bool_scalar_multiplication"
"non_native/plonk/add_mul_zkllvm_compatible"
#"non_native/plonk/add_mul_zkllvm_compatible"
"non_native/plonk/scalar_non_native_range"
)

Expand Down

0 comments on commit 7099ebe

Please sign in to comment.