From e443eed23d8a65b0018d21e4a8683ed4a578c897 Mon Sep 17 00:00:00 2001 From: Jakob Degen Date: Mon, 7 Oct 2024 12:49:52 -0700 Subject: [PATCH] tests: Move more of `tests/build` into `core` Summary: ``` for p in tests/e2e/build/test_*.py rg 'inplace=True' $p && continue sl mv $p tests/core/build/ set part (string sub -e -3 $p) sl mv "$part"_data tests/core/build end sl st -m -a -n | xargs sed -i -E 's|inplace=False,||' sl st -m -a -n | xargs sed -i -E 's|inplace=False||' arc f ``` And then split the targets file I discovered after originally writing this diff that some of these tests are !inplace but actually depend on ovr_config and the prelude. Most of those were pretty straightforward to fix, but `test_build_isolated` is not and so was left out of this change Reviewed By: IanChilds Differential Revision: D63972135 fbshipit-source-id: 2ae7b84b935344a687740f64a599c6328d41a905 --- tests/core/build/BUCK | 214 +++++++++++++++++ .../build/test_action_error_handler_types.py | 2 +- .../.buckconfig | 0 .../error_handler_impl.bzl | 0 .../platforms/TARGETS.fixture | 0 .../platforms/defs.bzl | 0 .../prelude/prelude.bzl | 0 .../test_action_error_handler_types.bxl | 0 .../build/test_build_id_env_var.py | 4 +- .../test_build_id_env_var_data/.buckconfig | 0 .../TARGETS.fixture | 0 .../build/test_build_id_env_var_data/defs.bzl | 0 .../prelude/prelude.bzl | 0 .../build/test_build_output_file_hashes.py | 2 +- .../.buckconfig | 0 .../TARGETS.fixture | 0 .../file.txt | 0 .../folder/file_in_folder.txt | 0 .../{e2e => core}/build/test_build_report.py | 6 +- .../build/test_build_report_data/.buckconfig | 0 .../test_build_report_data/TARGETS.fixture | 0 .../build/test_build_report_data/rules.bzl | 0 .../subdir/TARGETS.fixture | 0 .../build/test_build_report_errors.py | 18 +- .../test_build_report_errors_data/.buckconfig | 0 .../test_build_report_errors_data/.buckroot | 0 .../config/TARGETS.fixture | 0 .../config/config_defs.bzl | 0 .../fail_action/TARGETS.fixture | 0 .../fail_action/fail_action.bzl | 0 .../fail_action_with_error_handler.bzl | 0 .../fail_action/fail_compile.py | 0 .../fail_action/fail_indent.py | 0 .../fail_analysis/TARGETS.fixture | 0 .../fail_analysis/fail_analysis.bzl | 0 .../fail_config/TARGETS.fixture | 0 .../fail_config/fail_config.bzl | 0 .../fail_load/TARGETS.fixture | 0 ...n_fail_many_with_error_handler.golden.json | 0 .../fixtures/test_action_fail_one.golden.json | 0 ...on_fail_one_with_error_handler.golden.json | 0 ...l_one_with_error_handler_no_op.golden.json | 0 ...ion_fail_shared_across_targets.golden.json | 0 .../test_action_fail_shared_dep.golden.json | 0 .../fixtures/test_action_fail_two.golden.json | 0 ...action_fail_with_stdout_stderr.golden.json | 0 .../test_analysis_and_action.golden.json | 0 .../fixtures/test_analysis_fail.golden.json | 0 .../test_analysis_fail_multi.golden.json | 0 .../test_configuration_fail.golden.json | 0 .../fixtures/test_load_fail.golden.json | 0 .../test_load_fail_full_package.golden.json | 0 .../fixtures/test_missing.golden.json | 0 .../test_no_terminal_colors.golden.json | 0 .../fixtures/test_one_of_each.golden.json | 0 .../test_partially_missing.golden.json | 0 ...d_not_produce_error_diagnostics.golden.txt | 0 ...rr_with_empty_error_diagnostics.golden.txt | 0 ...t_stderr_with_error_diagnostics.golden.txt | 0 ...tderr_with_no_error_diagnostics.golden.txt | 0 .../missing/TARGETS.fixture | 0 .../success/TARGETS.fixture | 0 .../success/success.bzl | 0 .../terminal_colors/TARGETS.fixture | 0 .../terminal_colors/terminal_colors.bzl | 0 .../test_build_report_errors_data/utils.bzl | 0 .../build/test_build_response.py | 2 +- .../test_build_response_data/.buckconfig | 0 .../test_build_response_data/TARGETS.fixture | 0 .../build/test_build_response_data/defs.bzl | 0 .../build/test_build_root_executable.py | 4 +- .../.buckconfig | 0 .../TARGETS.fixture | 0 .../test_build_root_executable_data/defs.bzl | 0 .../prelude.bzl | 0 .../test_build_root_executable_data/touch.bat | 0 .../test_build_root_executable_data/touch.sh | 0 .../test_build_rule_type_name_logging.py | 10 +- .../.buckconfig | 0 .../TARGETS.fixture | 0 .../defs.bzl | 0 .../test_build_skip_incompatible_targets.py | 2 +- .../.buckconfig | 0 .../.buckroot | 0 .../TARGETS.fixture | 0 .../build/test_build_system_info.py | 4 +- .../test_build_system_info_data/.buckconfig | 0 .../test_build_system_info_data/.buckroot | 0 .../TARGETS.fixture | 0 .../{e2e => core}/build/test_cancellation.py | 4 +- .../build/test_cancellation_data/.buckconfig | 0 .../test_cancellation_data/TARGETS.fixture | 0 .../build/test_cancellation_data/build.bxl | 0 .../build/test_cancellation_data/defs.bzl | 0 .../prelude/prelude.bzl | 0 .../build/test_cancellation_data/slow.py | 0 .../{e2e => core}/build/test_critical_path.py | 14 +- .../build/test_critical_path_data/.buckconfig | 0 .../build/test_critical_path_data/.buckroot | 0 .../test_critical_path_data/TARGETS.fixture | 0 .../prelude/prelude.bzl | 0 tests/{e2e => core}/build/test_dep_files.py | 30 ++- .../test_dep_files_data/dep_files/.buckconfig | 0 .../dep_files/app/TARGETS.fixture | 0 .../test_dep_files_data/dep_files/app/app.c | 0 .../test_dep_files_data/dep_files/app/app.h | 0 .../test_dep_files_data/dep_files/app/other.h | 0 .../dep_files/prelude/prelude.bzl | 0 .../dep_files/tools/TARGETS.fixture | 0 .../dep_files/tools/gcc.py | 0 .../invalid_dep_files/.buckconfig | 0 .../invalid_dep_files/TARGETS.fixture | 0 .../invalid_dep_files/prelude/prelude.bzl | 0 .../mismatched_outputs_dep_files/.buckconfig | 0 .../TARGETS.fixture | 0 .../prelude/prelude.bzl | 0 .../upload_dep_files/.buckconfig | 0 .../upload_dep_files/TARGETS.fixture | 0 .../upload_dep_files/create_dep_file.py | 0 .../platforms/TARGETS.fixture | 0 .../upload_dep_files/platforms/rules.bzl | 0 .../upload_dep_files/prelude/prelude.bzl | 0 .../upload_dep_files/untagged.1 | 0 .../upload_dep_files/untagged.2 | 0 .../upload_dep_files/unused.1 | 0 .../upload_dep_files/unused.2 | 0 .../upload_dep_files/used.1 | 0 .../upload_dep_files/used.2 | 0 .../upload_dep_files/used.3 | 0 .../build/test_executor_with_dependencies.py | 6 +- .../.buckconfig | 0 .../TARGETS.fixture | 0 .../defs.bzl | 0 .../platforms/TARGETS.fixture | 0 .../platforms/defs.bzl | 0 .../prelude/prelude.bzl | 0 .../build/test_hash_all_commands.py | 6 +- .../test_hash_all_commands_data/.buckconfig | 0 .../TARGETS.fixture | 0 .../prelude/prelude.bzl | 0 .../build/test_nested_subtargets.py | 4 +- .../test_nested_subtargets_data/.buckconfig | 0 .../TARGETS.fixture | 0 .../test_nested_subtargets_data/defs.bzl | 0 tests/{e2e => core}/build/test_out_flag.py | 22 +- .../build/test_out_flag_data/.buckconfig | 0 .../build/test_out_flag_data/TARGETS.fixture | 0 .../build/test_out_flag_data/a.txt | 0 .../build/test_out_flag_data/b.txt | 0 .../build/test_out_flag_data/defs.bzl | 0 .../build/test_out_flag_data/directory/b.txt | 0 .../directory/nested_dir/a.txt | 0 tests/{e2e => core}/build/test_plugins.py | 12 +- .../build/test_plugins_data/.buckconfig | 0 .../build/test_plugins_data/.buckroot | 0 .../test_plugins_data/config/TARGETS.fixture | 0 .../build/test_plugins_data/config/defs.bzl | 0 .../test_plugins_data/prelude/prelude.bzl | 0 .../repeated_insertion/TARGETS.fixture | 0 .../repeated_insertion/rules.bzl | 0 .../test_errors/TARGETS.fixture | 0 .../test_plugins_data/test_errors/rules.bzl | 0 .../test_plugins_data/tests/TARGETS.fixture | 0 .../build/test_plugins_data/tests/rules.bzl | 0 .../visibility/TARGETS.fixture | 0 .../visibility/package/TARGETS.fixture | 0 .../test_plugins_data/visibility/rules.bzl | 0 .../build/test_remote_execution.py | 2 +- .../test_remote_execution_data/.buckconfig | 0 .../TARGETS.fixture | 0 .../build/test_remote_execution_data/defs.bzl | 0 tests/{e2e => core}/build/test_symlinks.py | 4 +- .../build/test_symlinks_data/.buckconfig | 0 .../build/test_symlinks_data/TARGETS.fixture | 0 .../build/test_symlinks_data/defs.bzl | 0 .../build/test_symlinks_data/dir/file | 0 .../build/test_symlinks_data/dir2/file | 0 .../build/test_symlinks_data/ext/link/file | 0 .../test_symlinks_data/prelude/prelude.bzl | 0 .../build/test_symlinks_data/src/link | 0 .../build/test_target_aliases.py | 6 +- .../test_target_aliases_data/.buckconfig | 0 .../broken/TARGETS.fixture | 0 .../prelude/prelude.bzl | 0 .../targets/TARGETS.fixture | 0 .../{e2e => core}/build/test_uncategorized.py | 35 ++- .../action_digest/.buckconfig | 0 .../action_digest/.buckroot | 0 .../action_digest/TARGETS.fixture | 0 .../action_digest/defs.bzl | 0 .../action_digest/prelude.bzl | 0 .../action_digest/test.py | 0 .../anon_exec_deps/.buckconfig | 0 .../anon_exec_deps/platforms/TARGETS.fixture | 0 .../anon_exec_deps/prelude/prelude.bzl | 0 .../anon_exec_deps/rules/exec_deps.bzl | 0 .../anon_exec_deps/rules/rules.bzl | 0 .../anon_exec_deps/tests/TARGETS.fixture | 0 .../anon_exec_deps/tests/local_only.py | 0 .../anon_exec_deps/tests/remote_only.py | 0 .../test_uncategorized_data/args/.buckconfig | 0 .../args/TARGETS.fixture | 0 .../test_uncategorized_data/args/defs.bzl | 0 .../args/prelude/prelude.bzl | 0 .../artifact_consistency/.buckconfig | 0 .../artifact_consistency/.buckroot | 0 .../artifact_consistency/TARGETS.fixture | 0 .../artifact_consistency/gen.py | 0 .../artifact_consistency/prelude/prelude.bzl | 0 .../buckroot/.buckconfig | 0 .../buckroot/rooted/.buckconfig | 0 .../buckroot/rooted/.buckroot | 0 .../buckroot/rooted/OUTER | 0 .../buckroot/rooted/cell/.buckconfig | 0 .../buckroot/rooted/cell/INNER | 0 .../buckroot/rooted/cell/prelude.bzl | 0 .../build_providers/.buckconfig | 0 .../build_providers/TARGETS.fixture | 0 .../build_providers/build | 0 .../build_providers/prelude/prelude.bzl | 0 .../build_providers/run | 0 .../build_providers/test | 0 .../cell_delete/.buckconfig | 0 .../cell_delete/TARGETS.fixture | 0 .../cell_delete/prelude/prelude.bzl | 0 .../cleanup/.buckconfig | 0 .../cleanup/TARGETS.fixture | 0 .../test_uncategorized_data/cleanup/defs.bzl | 0 .../cleanup/prelude/prelude.bzl | 0 .../concurrency/.buckconfig | 0 .../concurrency/TARGETS.fixture | 0 .../concurrency/defs.bzl | 0 .../concurrency/prelude/prelude.bzl | 0 .../fail_fast/.buckconfig | 0 .../fail_fast/TARGETS.fixture | 0 .../fail_fast/defs.bzl | 0 .../fail_fast/prelude/prelude.bzl | 0 .../invalid_file_invalidation/.buckconfig | 0 .../invalid_file_invalidation/TARGETS.fixture | 0 .../invalid_file_invalidation/defs.bzl | 0 .../prelude/prelude.bzl | 0 .../invalid_file_invalidation/src/a | 0 .../keep_going_build/.buckconfig | 0 .../keep_going_build/TARGETS.fixture | 0 .../keep_going_build/defs.bzl | 0 .../keep_going_build/prelude/prelude.bzl | 0 .../log_action_keys/.buckconfig | 0 .../log_action_keys/TARGETS.fixture | 0 .../log_action_keys/defs.bzl | 0 .../log_action_keys/platforms/TARGETS.fixture | 0 .../log_action_keys/platforms/defs.bzl | 0 .../log_action_keys/prelude/prelude.bzl | 0 .../.buckconfig | 0 .../TARGETS.fixture | 0 .../defs.bzl | 0 .../platforms/TARGETS.fixture | 0 .../platforms/defs.bzl | 0 .../prelude/prelude.bzl | 0 .../remote_only.py | 0 .../prelude_import/.buckconfig | 0 .../prelude_import/cell1/.buckconfig | 0 .../prelude_import/cell1/TARGETS.fixture | 0 .../prelude_import/cell2/.buckconfig | 0 .../prelude_import/cell2/TARGETS.fixture | 0 .../prelude_import/prelude/.buckconfig | 0 .../prelude_import/prelude/prelude.bzl | 0 .../projected_artifacts/.buckconfig | 0 .../projected_artifacts/TARGETS.fixture | 0 .../projected_artifacts/commands/exists.py | 0 .../commands/gen_fixture.py | 0 .../projected_artifacts/prelude/prelude.bzl | 0 .../test_uncategorized_data/roots/.buckconfig | 0 .../roots/TARGETS.fixture | 0 .../test_uncategorized_data/roots/defs.bzl | 0 .../roots/other/.buckconfig | 0 .../roots/other/TARGETS.fixture | 0 .../test_uncategorized_data/roots/prelude.bzl | 0 .../tmpdir/.buckconfig | 0 .../test_uncategorized_data/tmpdir/.buckroot | 0 .../tmpdir/TARGETS.fixture | 0 .../test_uncategorized_data/tmpdir/defs.bzl | 0 .../tmpdir/prelude.bzl | 0 .../test_uncategorized_data/tmpdir/test.py | 0 .../upload_all_actions/.buckconfig | 0 .../upload_all_actions/TARGETS.fixture | 0 .../upload_all_actions/defs.bzl | 0 .../upload_all_actions/prelude/prelude.bzl | 0 tests/e2e/build/BUCK | 224 ------------------ 288 files changed, 310 insertions(+), 327 deletions(-) create mode 100644 tests/core/build/BUCK rename tests/{e2e => core}/build/test_action_error_handler_types.py (95%) rename tests/{e2e => core}/build/test_action_error_handler_types_data/.buckconfig (100%) rename tests/{e2e => core}/build/test_action_error_handler_types_data/error_handler_impl.bzl (100%) rename tests/{e2e => core}/build/test_action_error_handler_types_data/platforms/TARGETS.fixture (100%) rename tests/{e2e => core}/build/test_action_error_handler_types_data/platforms/defs.bzl (100%) rename tests/{e2e => core}/build/test_action_error_handler_types_data/prelude/prelude.bzl (100%) rename tests/{e2e => core}/build/test_action_error_handler_types_data/test_action_error_handler_types.bxl (100%) rename tests/{e2e => core}/build/test_build_id_env_var.py (96%) rename tests/{e2e => core}/build/test_build_id_env_var_data/.buckconfig (100%) rename tests/{e2e => core}/build/test_build_id_env_var_data/TARGETS.fixture (100%) rename tests/{e2e => core}/build/test_build_id_env_var_data/defs.bzl (100%) rename tests/{e2e => core}/build/test_build_id_env_var_data/prelude/prelude.bzl (100%) rename tests/{e2e => core}/build/test_build_output_file_hashes.py (98%) rename tests/{e2e => core}/build/test_build_output_file_hashes_data/.buckconfig (100%) rename tests/{e2e => core}/build/test_build_output_file_hashes_data/TARGETS.fixture (100%) rename tests/{e2e => core}/build/test_build_output_file_hashes_data/file.txt (100%) rename tests/{e2e => core}/build/test_build_output_file_hashes_data/folder/file_in_folder.txt (100%) rename tests/{e2e => core}/build/test_build_report.py (98%) rename tests/{e2e => core}/build/test_build_report_data/.buckconfig (100%) rename tests/{e2e => core}/build/test_build_report_data/TARGETS.fixture (100%) rename tests/{e2e => core}/build/test_build_report_data/rules.bzl (100%) rename tests/{e2e => core}/build/test_build_report_data/subdir/TARGETS.fixture (100%) rename tests/{e2e => core}/build/test_build_report_errors.py (97%) rename tests/{e2e => core}/build/test_build_report_errors_data/.buckconfig (100%) rename tests/{e2e => core}/build/test_build_report_errors_data/.buckroot (100%) rename tests/{e2e => core}/build/test_build_report_errors_data/config/TARGETS.fixture (100%) rename tests/{e2e => core}/build/test_build_report_errors_data/config/config_defs.bzl (100%) rename tests/{e2e => core}/build/test_build_report_errors_data/fail_action/TARGETS.fixture (100%) rename tests/{e2e => core}/build/test_build_report_errors_data/fail_action/fail_action.bzl (100%) rename tests/{e2e => core}/build/test_build_report_errors_data/fail_action/fail_action_with_error_handler.bzl (100%) rename tests/{e2e => core}/build/test_build_report_errors_data/fail_action/fail_compile.py (100%) rename tests/{e2e => core}/build/test_build_report_errors_data/fail_action/fail_indent.py (100%) rename tests/{e2e => core}/build/test_build_report_errors_data/fail_analysis/TARGETS.fixture (100%) rename tests/{e2e => core}/build/test_build_report_errors_data/fail_analysis/fail_analysis.bzl (100%) rename tests/{e2e => core}/build/test_build_report_errors_data/fail_config/TARGETS.fixture (100%) rename tests/{e2e => core}/build/test_build_report_errors_data/fail_config/fail_config.bzl (100%) rename tests/{e2e => core}/build/test_build_report_errors_data/fail_load/TARGETS.fixture (100%) rename tests/{e2e => core}/build/test_build_report_errors_data/fixtures/test_action_fail_many_with_error_handler.golden.json (100%) rename tests/{e2e => core}/build/test_build_report_errors_data/fixtures/test_action_fail_one.golden.json (100%) rename tests/{e2e => core}/build/test_build_report_errors_data/fixtures/test_action_fail_one_with_error_handler.golden.json (100%) rename tests/{e2e => core}/build/test_build_report_errors_data/fixtures/test_action_fail_one_with_error_handler_no_op.golden.json (100%) rename tests/{e2e => core}/build/test_build_report_errors_data/fixtures/test_action_fail_shared_across_targets.golden.json (100%) rename tests/{e2e => core}/build/test_build_report_errors_data/fixtures/test_action_fail_shared_dep.golden.json (100%) rename tests/{e2e => core}/build/test_build_report_errors_data/fixtures/test_action_fail_two.golden.json (100%) rename tests/{e2e => core}/build/test_build_report_errors_data/fixtures/test_action_fail_with_stdout_stderr.golden.json (100%) rename tests/{e2e => core}/build/test_build_report_errors_data/fixtures/test_analysis_and_action.golden.json (100%) rename tests/{e2e => core}/build/test_build_report_errors_data/fixtures/test_analysis_fail.golden.json (100%) rename tests/{e2e => core}/build/test_build_report_errors_data/fixtures/test_analysis_fail_multi.golden.json (100%) rename tests/{e2e => core}/build/test_build_report_errors_data/fixtures/test_configuration_fail.golden.json (100%) rename tests/{e2e => core}/build/test_build_report_errors_data/fixtures/test_load_fail.golden.json (100%) rename tests/{e2e => core}/build/test_build_report_errors_data/fixtures/test_load_fail_full_package.golden.json (100%) rename tests/{e2e => core}/build/test_build_report_errors_data/fixtures/test_missing.golden.json (100%) rename tests/{e2e => core}/build/test_build_report_errors_data/fixtures/test_no_terminal_colors.golden.json (100%) rename tests/{e2e => core}/build/test_build_report_errors_data/fixtures/test_one_of_each.golden.json (100%) rename tests/{e2e => core}/build/test_build_report_errors_data/fixtures/test_partially_missing.golden.json (100%) rename tests/{e2e => core}/build/test_build_report_errors_data/fixtures/test_stderr_could_not_produce_error_diagnostics.golden.txt (100%) rename tests/{e2e => core}/build/test_build_report_errors_data/fixtures/test_stderr_with_empty_error_diagnostics.golden.txt (100%) rename tests/{e2e => core}/build/test_build_report_errors_data/fixtures/test_stderr_with_error_diagnostics.golden.txt (100%) rename tests/{e2e => core}/build/test_build_report_errors_data/fixtures/test_stderr_with_no_error_diagnostics.golden.txt (100%) rename tests/{e2e => core}/build/test_build_report_errors_data/missing/TARGETS.fixture (100%) rename tests/{e2e => core}/build/test_build_report_errors_data/success/TARGETS.fixture (100%) rename tests/{e2e => core}/build/test_build_report_errors_data/success/success.bzl (100%) rename tests/{e2e => core}/build/test_build_report_errors_data/terminal_colors/TARGETS.fixture (100%) rename tests/{e2e => core}/build/test_build_report_errors_data/terminal_colors/terminal_colors.bzl (100%) rename tests/{e2e => core}/build/test_build_report_errors_data/utils.bzl (100%) rename tests/{e2e => core}/build/test_build_response.py (98%) rename tests/{e2e => core}/build/test_build_response_data/.buckconfig (100%) rename tests/{e2e => core}/build/test_build_response_data/TARGETS.fixture (100%) rename tests/{e2e => core}/build/test_build_response_data/defs.bzl (100%) rename tests/{e2e => core}/build/test_build_root_executable.py (94%) rename tests/{e2e => core}/build/test_build_root_executable_data/.buckconfig (100%) rename tests/{e2e => core}/build/test_build_root_executable_data/TARGETS.fixture (100%) rename tests/{e2e => core}/build/test_build_root_executable_data/defs.bzl (100%) rename tests/{e2e => core}/build/test_build_root_executable_data/prelude.bzl (100%) rename tests/{e2e => core}/build/test_build_root_executable_data/touch.bat (100%) rename tests/{e2e => core}/build/test_build_root_executable_data/touch.sh (100%) rename tests/{e2e => core}/build/test_build_rule_type_name_logging.py (93%) rename tests/{e2e => core}/build/test_build_rule_type_name_logging_data/.buckconfig (100%) rename tests/{e2e => core}/build/test_build_rule_type_name_logging_data/TARGETS.fixture (100%) rename tests/{e2e => core}/build/test_build_rule_type_name_logging_data/defs.bzl (100%) rename tests/{e2e => core}/build/test_build_skip_incompatible_targets.py (98%) rename tests/{e2e => core}/build/test_build_skip_incompatible_targets_data/.buckconfig (100%) rename tests/{e2e => core}/build/test_build_skip_incompatible_targets_data/.buckroot (100%) rename tests/{e2e => core}/build/test_build_skip_incompatible_targets_data/TARGETS.fixture (100%) rename tests/{e2e => core}/build/test_build_system_info.py (96%) rename tests/{e2e => core}/build/test_build_system_info_data/.buckconfig (100%) rename tests/{e2e => core}/build/test_build_system_info_data/.buckroot (100%) rename tests/{e2e => core}/build/test_build_system_info_data/TARGETS.fixture (100%) rename tests/{e2e => core}/build/test_cancellation.py (97%) rename tests/{e2e => core}/build/test_cancellation_data/.buckconfig (100%) rename tests/{e2e => core}/build/test_cancellation_data/TARGETS.fixture (100%) rename tests/{e2e => core}/build/test_cancellation_data/build.bxl (100%) rename tests/{e2e => core}/build/test_cancellation_data/defs.bzl (100%) rename tests/{e2e => core}/build/test_cancellation_data/prelude/prelude.bzl (100%) rename tests/{e2e => core}/build/test_cancellation_data/slow.py (100%) rename tests/{e2e => core}/build/test_critical_path.py (97%) rename tests/{e2e => core}/build/test_critical_path_data/.buckconfig (100%) rename tests/{e2e => core}/build/test_critical_path_data/.buckroot (100%) rename tests/{e2e => core}/build/test_critical_path_data/TARGETS.fixture (100%) rename tests/{e2e => core}/build/test_critical_path_data/prelude/prelude.bzl (100%) rename tests/{e2e => core}/build/test_dep_files.py (96%) rename tests/{e2e => core}/build/test_dep_files_data/dep_files/.buckconfig (100%) rename tests/{e2e => core}/build/test_dep_files_data/dep_files/app/TARGETS.fixture (100%) rename tests/{e2e => core}/build/test_dep_files_data/dep_files/app/app.c (100%) rename tests/{e2e => core}/build/test_dep_files_data/dep_files/app/app.h (100%) rename tests/{e2e => core}/build/test_dep_files_data/dep_files/app/other.h (100%) rename tests/{e2e => core}/build/test_dep_files_data/dep_files/prelude/prelude.bzl (100%) rename tests/{e2e => core}/build/test_dep_files_data/dep_files/tools/TARGETS.fixture (100%) rename tests/{e2e => core}/build/test_dep_files_data/dep_files/tools/gcc.py (100%) rename tests/{e2e => core}/build/test_dep_files_data/invalid_dep_files/.buckconfig (100%) rename tests/{e2e => core}/build/test_dep_files_data/invalid_dep_files/TARGETS.fixture (100%) rename tests/{e2e => core}/build/test_dep_files_data/invalid_dep_files/prelude/prelude.bzl (100%) rename tests/{e2e => core}/build/test_dep_files_data/mismatched_outputs_dep_files/.buckconfig (100%) rename tests/{e2e => core}/build/test_dep_files_data/mismatched_outputs_dep_files/TARGETS.fixture (100%) rename tests/{e2e => core}/build/test_dep_files_data/mismatched_outputs_dep_files/prelude/prelude.bzl (100%) rename tests/{e2e => core}/build/test_dep_files_data/upload_dep_files/.buckconfig (100%) rename tests/{e2e => core}/build/test_dep_files_data/upload_dep_files/TARGETS.fixture (100%) rename tests/{e2e => core}/build/test_dep_files_data/upload_dep_files/create_dep_file.py (100%) rename tests/{e2e => core}/build/test_dep_files_data/upload_dep_files/platforms/TARGETS.fixture (100%) rename tests/{e2e => core}/build/test_dep_files_data/upload_dep_files/platforms/rules.bzl (100%) rename tests/{e2e => core}/build/test_dep_files_data/upload_dep_files/prelude/prelude.bzl (100%) rename tests/{e2e => core}/build/test_dep_files_data/upload_dep_files/untagged.1 (100%) rename tests/{e2e => core}/build/test_dep_files_data/upload_dep_files/untagged.2 (100%) rename tests/{e2e => core}/build/test_dep_files_data/upload_dep_files/unused.1 (100%) rename tests/{e2e => core}/build/test_dep_files_data/upload_dep_files/unused.2 (100%) rename tests/{e2e => core}/build/test_dep_files_data/upload_dep_files/used.1 (100%) rename tests/{e2e => core}/build/test_dep_files_data/upload_dep_files/used.2 (100%) rename tests/{e2e => core}/build/test_dep_files_data/upload_dep_files/used.3 (100%) rename tests/{e2e => core}/build/test_executor_with_dependencies.py (97%) rename tests/{e2e => core}/build/test_executor_with_dependencies_data/.buckconfig (100%) rename tests/{e2e => core}/build/test_executor_with_dependencies_data/TARGETS.fixture (100%) rename tests/{e2e => core}/build/test_executor_with_dependencies_data/defs.bzl (100%) rename tests/{e2e => core}/build/test_executor_with_dependencies_data/platforms/TARGETS.fixture (100%) rename tests/{e2e => core}/build/test_executor_with_dependencies_data/platforms/defs.bzl (100%) rename tests/{e2e => core}/build/test_executor_with_dependencies_data/prelude/prelude.bzl (100%) rename tests/{e2e => core}/build/test_hash_all_commands.py (97%) rename tests/{e2e => core}/build/test_hash_all_commands_data/.buckconfig (100%) rename tests/{e2e => core}/build/test_hash_all_commands_data/TARGETS.fixture (100%) rename tests/{e2e => core}/build/test_hash_all_commands_data/prelude/prelude.bzl (100%) rename tests/{e2e => core}/build/test_nested_subtargets.py (96%) rename tests/{e2e => core}/build/test_nested_subtargets_data/.buckconfig (100%) rename tests/{e2e => core}/build/test_nested_subtargets_data/TARGETS.fixture (100%) rename tests/{e2e => core}/build/test_nested_subtargets_data/defs.bzl (100%) rename tests/{e2e => core}/build/test_out_flag.py (92%) rename tests/{e2e => core}/build/test_out_flag_data/.buckconfig (100%) rename tests/{e2e => core}/build/test_out_flag_data/TARGETS.fixture (100%) rename tests/{e2e => core}/build/test_out_flag_data/a.txt (100%) rename tests/{e2e => core}/build/test_out_flag_data/b.txt (100%) rename tests/{e2e => core}/build/test_out_flag_data/defs.bzl (100%) rename tests/{e2e => core}/build/test_out_flag_data/directory/b.txt (100%) rename tests/{e2e => core}/build/test_out_flag_data/directory/nested_dir/a.txt (100%) rename tests/{e2e => core}/build/test_plugins.py (96%) rename tests/{e2e => core}/build/test_plugins_data/.buckconfig (100%) rename tests/{e2e => core}/build/test_plugins_data/.buckroot (100%) rename tests/{e2e => core}/build/test_plugins_data/config/TARGETS.fixture (100%) rename tests/{e2e => core}/build/test_plugins_data/config/defs.bzl (100%) rename tests/{e2e => core}/build/test_plugins_data/prelude/prelude.bzl (100%) rename tests/{e2e => core}/build/test_plugins_data/repeated_insertion/TARGETS.fixture (100%) rename tests/{e2e => core}/build/test_plugins_data/repeated_insertion/rules.bzl (100%) rename tests/{e2e => core}/build/test_plugins_data/test_errors/TARGETS.fixture (100%) rename tests/{e2e => core}/build/test_plugins_data/test_errors/rules.bzl (100%) rename tests/{e2e => core}/build/test_plugins_data/tests/TARGETS.fixture (100%) rename tests/{e2e => core}/build/test_plugins_data/tests/rules.bzl (100%) rename tests/{e2e => core}/build/test_plugins_data/visibility/TARGETS.fixture (100%) rename tests/{e2e => core}/build/test_plugins_data/visibility/package/TARGETS.fixture (100%) rename tests/{e2e => core}/build/test_plugins_data/visibility/rules.bzl (100%) rename tests/{e2e => core}/build/test_remote_execution.py (97%) rename tests/{e2e => core}/build/test_remote_execution_data/.buckconfig (100%) rename tests/{e2e => core}/build/test_remote_execution_data/TARGETS.fixture (100%) rename tests/{e2e => core}/build/test_remote_execution_data/defs.bzl (100%) rename tests/{e2e => core}/build/test_symlinks.py (98%) rename tests/{e2e => core}/build/test_symlinks_data/.buckconfig (100%) rename tests/{e2e => core}/build/test_symlinks_data/TARGETS.fixture (100%) rename tests/{e2e => core}/build/test_symlinks_data/defs.bzl (100%) rename tests/{e2e => core}/build/test_symlinks_data/dir/file (100%) rename tests/{e2e => core}/build/test_symlinks_data/dir2/file (100%) rename tests/{e2e => core}/build/test_symlinks_data/ext/link/file (100%) rename tests/{e2e => core}/build/test_symlinks_data/prelude/prelude.bzl (100%) rename tests/{e2e => core}/build/test_symlinks_data/src/link (100%) rename tests/{e2e => core}/build/test_target_aliases.py (97%) rename tests/{e2e => core}/build/test_target_aliases_data/.buckconfig (100%) rename tests/{e2e => core}/build/test_target_aliases_data/broken/TARGETS.fixture (100%) rename tests/{e2e => core}/build/test_target_aliases_data/prelude/prelude.bzl (100%) rename tests/{e2e => core}/build/test_target_aliases_data/targets/TARGETS.fixture (100%) rename tests/{e2e => core}/build/test_uncategorized.py (94%) rename tests/{e2e => core}/build/test_uncategorized_data/action_digest/.buckconfig (100%) rename tests/{e2e => core}/build/test_uncategorized_data/action_digest/.buckroot (100%) rename tests/{e2e => core}/build/test_uncategorized_data/action_digest/TARGETS.fixture (100%) rename tests/{e2e => core}/build/test_uncategorized_data/action_digest/defs.bzl (100%) rename tests/{e2e => core}/build/test_uncategorized_data/action_digest/prelude.bzl (100%) rename tests/{e2e => core}/build/test_uncategorized_data/action_digest/test.py (100%) rename tests/{e2e => core}/build/test_uncategorized_data/anon_exec_deps/.buckconfig (100%) rename tests/{e2e => core}/build/test_uncategorized_data/anon_exec_deps/platforms/TARGETS.fixture (100%) rename tests/{e2e => core}/build/test_uncategorized_data/anon_exec_deps/prelude/prelude.bzl (100%) rename tests/{e2e => core}/build/test_uncategorized_data/anon_exec_deps/rules/exec_deps.bzl (100%) rename tests/{e2e => core}/build/test_uncategorized_data/anon_exec_deps/rules/rules.bzl (100%) rename tests/{e2e => core}/build/test_uncategorized_data/anon_exec_deps/tests/TARGETS.fixture (100%) rename tests/{e2e => core}/build/test_uncategorized_data/anon_exec_deps/tests/local_only.py (100%) rename tests/{e2e => core}/build/test_uncategorized_data/anon_exec_deps/tests/remote_only.py (100%) rename tests/{e2e => core}/build/test_uncategorized_data/args/.buckconfig (100%) rename tests/{e2e => core}/build/test_uncategorized_data/args/TARGETS.fixture (100%) rename tests/{e2e => core}/build/test_uncategorized_data/args/defs.bzl (100%) rename tests/{e2e => core}/build/test_uncategorized_data/args/prelude/prelude.bzl (100%) rename tests/{e2e => core}/build/test_uncategorized_data/artifact_consistency/.buckconfig (100%) rename tests/{e2e => core}/build/test_uncategorized_data/artifact_consistency/.buckroot (100%) rename tests/{e2e => core}/build/test_uncategorized_data/artifact_consistency/TARGETS.fixture (100%) rename tests/{e2e => core}/build/test_uncategorized_data/artifact_consistency/gen.py (100%) rename tests/{e2e => core}/build/test_uncategorized_data/artifact_consistency/prelude/prelude.bzl (100%) rename tests/{e2e => core}/build/test_uncategorized_data/buckroot/.buckconfig (100%) rename tests/{e2e => core}/build/test_uncategorized_data/buckroot/rooted/.buckconfig (100%) rename tests/{e2e => core}/build/test_uncategorized_data/buckroot/rooted/.buckroot (100%) rename tests/{e2e => core}/build/test_uncategorized_data/buckroot/rooted/OUTER (100%) rename tests/{e2e => core}/build/test_uncategorized_data/buckroot/rooted/cell/.buckconfig (100%) rename tests/{e2e => core}/build/test_uncategorized_data/buckroot/rooted/cell/INNER (100%) rename tests/{e2e => core}/build/test_uncategorized_data/buckroot/rooted/cell/prelude.bzl (100%) rename tests/{e2e => core}/build/test_uncategorized_data/build_providers/.buckconfig (100%) rename tests/{e2e => core}/build/test_uncategorized_data/build_providers/TARGETS.fixture (100%) rename tests/{e2e => core}/build/test_uncategorized_data/build_providers/build (100%) rename tests/{e2e => core}/build/test_uncategorized_data/build_providers/prelude/prelude.bzl (100%) rename tests/{e2e => core}/build/test_uncategorized_data/build_providers/run (100%) rename tests/{e2e => core}/build/test_uncategorized_data/build_providers/test (100%) rename tests/{e2e => core}/build/test_uncategorized_data/cell_delete/.buckconfig (100%) rename tests/{e2e => core}/build/test_uncategorized_data/cell_delete/TARGETS.fixture (100%) rename tests/{e2e => core}/build/test_uncategorized_data/cell_delete/prelude/prelude.bzl (100%) rename tests/{e2e => core}/build/test_uncategorized_data/cleanup/.buckconfig (100%) rename tests/{e2e => core}/build/test_uncategorized_data/cleanup/TARGETS.fixture (100%) rename tests/{e2e => core}/build/test_uncategorized_data/cleanup/defs.bzl (100%) rename tests/{e2e => core}/build/test_uncategorized_data/cleanup/prelude/prelude.bzl (100%) rename tests/{e2e => core}/build/test_uncategorized_data/concurrency/.buckconfig (100%) rename tests/{e2e => core}/build/test_uncategorized_data/concurrency/TARGETS.fixture (100%) rename tests/{e2e => core}/build/test_uncategorized_data/concurrency/defs.bzl (100%) rename tests/{e2e => core}/build/test_uncategorized_data/concurrency/prelude/prelude.bzl (100%) rename tests/{e2e => core}/build/test_uncategorized_data/fail_fast/.buckconfig (100%) rename tests/{e2e => core}/build/test_uncategorized_data/fail_fast/TARGETS.fixture (100%) rename tests/{e2e => core}/build/test_uncategorized_data/fail_fast/defs.bzl (100%) rename tests/{e2e => core}/build/test_uncategorized_data/fail_fast/prelude/prelude.bzl (100%) rename tests/{e2e => core}/build/test_uncategorized_data/invalid_file_invalidation/.buckconfig (100%) rename tests/{e2e => core}/build/test_uncategorized_data/invalid_file_invalidation/TARGETS.fixture (100%) rename tests/{e2e => core}/build/test_uncategorized_data/invalid_file_invalidation/defs.bzl (100%) rename tests/{e2e => core}/build/test_uncategorized_data/invalid_file_invalidation/prelude/prelude.bzl (100%) rename tests/{e2e => core}/build/test_uncategorized_data/invalid_file_invalidation/src/a (100%) rename tests/{e2e => core}/build/test_uncategorized_data/keep_going_build/.buckconfig (100%) rename tests/{e2e => core}/build/test_uncategorized_data/keep_going_build/TARGETS.fixture (100%) rename tests/{e2e => core}/build/test_uncategorized_data/keep_going_build/defs.bzl (100%) rename tests/{e2e => core}/build/test_uncategorized_data/keep_going_build/prelude/prelude.bzl (100%) rename tests/{e2e => core}/build/test_uncategorized_data/log_action_keys/.buckconfig (100%) rename tests/{e2e => core}/build/test_uncategorized_data/log_action_keys/TARGETS.fixture (100%) rename tests/{e2e => core}/build/test_uncategorized_data/log_action_keys/defs.bzl (100%) rename tests/{e2e => core}/build/test_uncategorized_data/log_action_keys/platforms/TARGETS.fixture (100%) rename tests/{e2e => core}/build/test_uncategorized_data/log_action_keys/platforms/defs.bzl (100%) rename tests/{e2e => core}/build/test_uncategorized_data/log_action_keys/prelude/prelude.bzl (100%) rename tests/{e2e => core}/build/test_uncategorized_data/materialize_inputs_for_failed_actions/.buckconfig (100%) rename tests/{e2e => core}/build/test_uncategorized_data/materialize_inputs_for_failed_actions/TARGETS.fixture (100%) rename tests/{e2e => core}/build/test_uncategorized_data/materialize_inputs_for_failed_actions/defs.bzl (100%) rename tests/{e2e => core}/build/test_uncategorized_data/materialize_inputs_for_failed_actions/platforms/TARGETS.fixture (100%) rename tests/{e2e => core}/build/test_uncategorized_data/materialize_inputs_for_failed_actions/platforms/defs.bzl (100%) rename tests/{e2e => core}/build/test_uncategorized_data/materialize_inputs_for_failed_actions/prelude/prelude.bzl (100%) rename tests/{e2e => core}/build/test_uncategorized_data/materialize_inputs_for_failed_actions/remote_only.py (100%) rename tests/{e2e => core}/build/test_uncategorized_data/prelude_import/.buckconfig (100%) rename tests/{e2e => core}/build/test_uncategorized_data/prelude_import/cell1/.buckconfig (100%) rename tests/{e2e => core}/build/test_uncategorized_data/prelude_import/cell1/TARGETS.fixture (100%) rename tests/{e2e => core}/build/test_uncategorized_data/prelude_import/cell2/.buckconfig (100%) rename tests/{e2e => core}/build/test_uncategorized_data/prelude_import/cell2/TARGETS.fixture (100%) rename tests/{e2e => core}/build/test_uncategorized_data/prelude_import/prelude/.buckconfig (100%) rename tests/{e2e => core}/build/test_uncategorized_data/prelude_import/prelude/prelude.bzl (100%) rename tests/{e2e => core}/build/test_uncategorized_data/projected_artifacts/.buckconfig (100%) rename tests/{e2e => core}/build/test_uncategorized_data/projected_artifacts/TARGETS.fixture (100%) rename tests/{e2e => core}/build/test_uncategorized_data/projected_artifacts/commands/exists.py (100%) rename tests/{e2e => core}/build/test_uncategorized_data/projected_artifacts/commands/gen_fixture.py (100%) rename tests/{e2e => core}/build/test_uncategorized_data/projected_artifacts/prelude/prelude.bzl (100%) rename tests/{e2e => core}/build/test_uncategorized_data/roots/.buckconfig (100%) rename tests/{e2e => core}/build/test_uncategorized_data/roots/TARGETS.fixture (100%) rename tests/{e2e => core}/build/test_uncategorized_data/roots/defs.bzl (100%) rename tests/{e2e => core}/build/test_uncategorized_data/roots/other/.buckconfig (100%) rename tests/{e2e => core}/build/test_uncategorized_data/roots/other/TARGETS.fixture (100%) rename tests/{e2e => core}/build/test_uncategorized_data/roots/prelude.bzl (100%) rename tests/{e2e => core}/build/test_uncategorized_data/tmpdir/.buckconfig (100%) rename tests/{e2e => core}/build/test_uncategorized_data/tmpdir/.buckroot (100%) rename tests/{e2e => core}/build/test_uncategorized_data/tmpdir/TARGETS.fixture (100%) rename tests/{e2e => core}/build/test_uncategorized_data/tmpdir/defs.bzl (100%) rename tests/{e2e => core}/build/test_uncategorized_data/tmpdir/prelude.bzl (100%) rename tests/{e2e => core}/build/test_uncategorized_data/tmpdir/test.py (100%) rename tests/{e2e => core}/build/test_uncategorized_data/upload_all_actions/.buckconfig (100%) rename tests/{e2e => core}/build/test_uncategorized_data/upload_all_actions/TARGETS.fixture (100%) rename tests/{e2e => core}/build/test_uncategorized_data/upload_all_actions/defs.bzl (100%) rename tests/{e2e => core}/build/test_uncategorized_data/upload_all_actions/prelude/prelude.bzl (100%) diff --git a/tests/core/build/BUCK b/tests/core/build/BUCK new file mode 100644 index 000000000000..e71f9d41ac0d --- /dev/null +++ b/tests/core/build/BUCK @@ -0,0 +1,214 @@ +load("@fbcode//buck2/tests:buck_e2e.bzl", "buck2_e2e_test") + +oncall("build_infra") + +buck2_e2e_test( + name = "test_build_output_file_hashes", + srcs = ["test_build_output_file_hashes.py"], + data_dir = "test_build_output_file_hashes_data", + env = { + "OVR_CONFIG": "1", + "PRELUDE": "$(location prelude//:prelude)", + }, + serialize_test_cases = False, +) + +buck2_e2e_test( + name = "test_build_skip_incompatible_targets", + srcs = ["test_build_skip_incompatible_targets.py"], + data_dir = "test_build_skip_incompatible_targets_data", +) + +buck2_e2e_test( + name = "test_build_root_executable", + srcs = ["test_build_root_executable.py"], + data_dir = "test_build_root_executable_data", + serialize_test_cases = False, +) + +buck2_e2e_test( + name = "test_plugins", + srcs = ["test_plugins.py"], + data_dir = "test_plugins_data", + serialize_test_cases = False, +) + +buck2_e2e_test( + name = "test_uncategorized", + srcs = ["test_uncategorized.py"], + data_dir = "test_uncategorized_data", + env = { + "RECLI": "$(location fbsource//xplat/remote_execution/dotslash:recli)", + }, + serialize_test_cases = False, + deps = [ + "fbcode//buck2/tests/e2e_util:utils", + ], +) + +buck2_e2e_test( + name = "test_hash_all_commands", + srcs = ["test_hash_all_commands.py"], + data_dir = "test_hash_all_commands_data", + # These tests heavily depend on watchman, which is flakey on non-Linux systems + skip_for_os = [ + "darwin", + "windows", + ], + deps = [ + "fbcode//buck2/tests/e2e_util:utils", + ], +) + +buck2_e2e_test( + name = "test_dep_files", + srcs = ["test_dep_files.py"], + data_dir = "test_dep_files_data", + deps = [ + "fbcode//buck2/tests/e2e_util:utils", + ], +) + +buck2_e2e_test( + name = "test_target_aliases", + srcs = ["test_target_aliases.py"], + data_dir = "test_target_aliases_data", +) + +buck2_e2e_test( + name = "test_symlinks", + srcs = ["test_symlinks.py"], + data_dir = "test_symlinks_data", + deps = [ + "fbcode//buck2/tests/e2e_util:utils", + ], +) + +buck2_e2e_test( + name = "test_out_flag", + srcs = ["test_out_flag.py"], + data_dir = "test_out_flag_data", + env = { + "OVR_CONFIG": "1", + "PRELUDE": "$(location prelude//:prelude)", + }, +) + +buck2_e2e_test( + name = "test_nested_subtargets", + srcs = ["test_nested_subtargets.py"], + data_dir = "test_nested_subtargets_data", + env = { + "OVR_CONFIG": "1", + "PRELUDE": "$(location prelude//:prelude)", + }, +) + +buck2_e2e_test( + name = "test_build_report", + srcs = ["test_build_report.py"], + data_dir = "test_build_report_data", + env = { + "OVR_CONFIG": "1", + "PRELUDE": "$(location prelude//:prelude)", + }, + deps = [ + "//buck2/tests/e2e_util:utils", + ], +) + +buck2_e2e_test( + name = "test_build_report_errors", + srcs = ["test_build_report_errors.py"], + data_dir = "test_build_report_errors_data", + deps = [ + "fbcode//buck2/tests/e2e_util:golden", + ], +) + +buck2_e2e_test( + name = "test_build_id_env_var", + srcs = ["test_build_id_env_var.py"], + data_dir = "test_build_id_env_var_data", + deps = [ + "//buck2/tests/e2e_util:utils", + ], +) + +buck2_e2e_test( + name = "test_cancellation", + srcs = ["test_cancellation.py"], + data_dir = "test_cancellation_data", + skip_for_os = ["windows"], +) + +buck2_e2e_test( + name = "test_critical_path", + srcs = ["test_critical_path.py"], + data_dir = "test_critical_path_data", + deps = [ + "//buck2/tests/e2e_util:utils", + ], +) + +buck2_e2e_test( + name = "test_build_response", + srcs = ["test_build_response.py"], + data_dir = "test_build_response_data", + env = { + "OVR_CONFIG": "1", + "PRELUDE": "$(location prelude//:prelude)", + }, + deps = [ + "//buck2/tests/e2e_util:utils", + ], +) + +buck2_e2e_test( + name = "test_build_rule_type_name_logging", + srcs = ["test_build_rule_type_name_logging.py"], + data_dir = "test_build_rule_type_name_logging_data", + env = { + "OVR_CONFIG": "1", + "PRELUDE": "$(location prelude//:prelude)", + }, + deps = [ + "//buck2/tests/e2e_util:utils", + ], +) + +buck2_e2e_test( + name = "test_executor_with_dependencies", + srcs = ["test_executor_with_dependencies.py"], + data_dir = "test_executor_with_dependencies_data", + deps = [ + "//buck2/tests/e2e_util:utils", + ], +) + +buck2_e2e_test( + name = "test_action_error_handler_types", + srcs = ["test_action_error_handler_types.py"], + data_dir = "test_action_error_handler_types_data", + deps = [ + "//buck2/tests/e2e_util:utils", + ], +) + +buck2_e2e_test( + name = "test_build_system_info", + srcs = ["test_build_system_info.py"], + data_dir = "test_build_system_info_data", + deps = [ + "//buck2/tests/e2e_util:utils", + ], +) + +buck2_e2e_test( + name = "test_remote_execution", + srcs = ["test_remote_execution.py"], + data_dir = "test_remote_execution_data", + deps = [ + "//buck2/tests/e2e_util:utils", + ], +) diff --git a/tests/e2e/build/test_action_error_handler_types.py b/tests/core/build/test_action_error_handler_types.py similarity index 95% rename from tests/e2e/build/test_action_error_handler_types.py rename to tests/core/build/test_action_error_handler_types.py index 888f22f4383b..00714f4a215f 100644 --- a/tests/e2e/build/test_action_error_handler_types.py +++ b/tests/core/build/test_action_error_handler_types.py @@ -12,7 +12,7 @@ from buck2.tests.e2e_util.buck_workspace import buck_test -@buck_test(inplace=False) +@buck_test() async def test_action_error_handler_types(buck: Buck) -> None: await buck.bxl( "//:test_action_error_handler_types.bxl:test_action_error_handler_types" diff --git a/tests/e2e/build/test_action_error_handler_types_data/.buckconfig b/tests/core/build/test_action_error_handler_types_data/.buckconfig similarity index 100% rename from tests/e2e/build/test_action_error_handler_types_data/.buckconfig rename to tests/core/build/test_action_error_handler_types_data/.buckconfig diff --git a/tests/e2e/build/test_action_error_handler_types_data/error_handler_impl.bzl b/tests/core/build/test_action_error_handler_types_data/error_handler_impl.bzl similarity index 100% rename from tests/e2e/build/test_action_error_handler_types_data/error_handler_impl.bzl rename to tests/core/build/test_action_error_handler_types_data/error_handler_impl.bzl diff --git a/tests/e2e/build/test_action_error_handler_types_data/platforms/TARGETS.fixture b/tests/core/build/test_action_error_handler_types_data/platforms/TARGETS.fixture similarity index 100% rename from tests/e2e/build/test_action_error_handler_types_data/platforms/TARGETS.fixture rename to tests/core/build/test_action_error_handler_types_data/platforms/TARGETS.fixture diff --git a/tests/e2e/build/test_action_error_handler_types_data/platforms/defs.bzl b/tests/core/build/test_action_error_handler_types_data/platforms/defs.bzl similarity index 100% rename from tests/e2e/build/test_action_error_handler_types_data/platforms/defs.bzl rename to tests/core/build/test_action_error_handler_types_data/platforms/defs.bzl diff --git a/tests/e2e/build/test_action_error_handler_types_data/prelude/prelude.bzl b/tests/core/build/test_action_error_handler_types_data/prelude/prelude.bzl similarity index 100% rename from tests/e2e/build/test_action_error_handler_types_data/prelude/prelude.bzl rename to tests/core/build/test_action_error_handler_types_data/prelude/prelude.bzl diff --git a/tests/e2e/build/test_action_error_handler_types_data/test_action_error_handler_types.bxl b/tests/core/build/test_action_error_handler_types_data/test_action_error_handler_types.bxl similarity index 100% rename from tests/e2e/build/test_action_error_handler_types_data/test_action_error_handler_types.bxl rename to tests/core/build/test_action_error_handler_types_data/test_action_error_handler_types.bxl diff --git a/tests/e2e/build/test_build_id_env_var.py b/tests/core/build/test_build_id_env_var.py similarity index 96% rename from tests/e2e/build/test_build_id_env_var.py rename to tests/core/build/test_build_id_env_var.py index a3143ca6a5fc..55432c3c6971 100644 --- a/tests/e2e/build/test_build_id_env_var.py +++ b/tests/core/build/test_build_id_env_var.py @@ -13,7 +13,7 @@ from buck2.tests.e2e_util.helper.utils import random_string -@buck_test(inplace=False) +@buck_test() async def test_build_id_env_var_is_set_locally(buck: Buck) -> None: result = await buck.build( "root//:top", @@ -29,7 +29,7 @@ async def test_build_id_env_var_is_set_locally(buck: Buck) -> None: assert f.read().strip() == result.buck_build_id -@buck_test(inplace=False) +@buck_test() async def test_build_id_env_var_is_set_remotely(buck: Buck) -> None: result = await buck.build( "root//:top", diff --git a/tests/e2e/build/test_build_id_env_var_data/.buckconfig b/tests/core/build/test_build_id_env_var_data/.buckconfig similarity index 100% rename from tests/e2e/build/test_build_id_env_var_data/.buckconfig rename to tests/core/build/test_build_id_env_var_data/.buckconfig diff --git a/tests/e2e/build/test_build_id_env_var_data/TARGETS.fixture b/tests/core/build/test_build_id_env_var_data/TARGETS.fixture similarity index 100% rename from tests/e2e/build/test_build_id_env_var_data/TARGETS.fixture rename to tests/core/build/test_build_id_env_var_data/TARGETS.fixture diff --git a/tests/e2e/build/test_build_id_env_var_data/defs.bzl b/tests/core/build/test_build_id_env_var_data/defs.bzl similarity index 100% rename from tests/e2e/build/test_build_id_env_var_data/defs.bzl rename to tests/core/build/test_build_id_env_var_data/defs.bzl diff --git a/tests/e2e/build/test_build_id_env_var_data/prelude/prelude.bzl b/tests/core/build/test_build_id_env_var_data/prelude/prelude.bzl similarity index 100% rename from tests/e2e/build/test_build_id_env_var_data/prelude/prelude.bzl rename to tests/core/build/test_build_id_env_var_data/prelude/prelude.bzl diff --git a/tests/e2e/build/test_build_output_file_hashes.py b/tests/core/build/test_build_output_file_hashes.py similarity index 98% rename from tests/e2e/build/test_build_output_file_hashes.py rename to tests/core/build/test_build_output_file_hashes.py index 27ff547febcc..ef5453152eb2 100644 --- a/tests/e2e/build/test_build_output_file_hashes.py +++ b/tests/core/build/test_build_output_file_hashes.py @@ -15,7 +15,7 @@ from buck2.tests.e2e_util.buck_workspace import buck_test -@buck_test(inplace=False) +@buck_test() async def test_file_output( buck: Buck, tmp_path: Path, diff --git a/tests/e2e/build/test_build_output_file_hashes_data/.buckconfig b/tests/core/build/test_build_output_file_hashes_data/.buckconfig similarity index 100% rename from tests/e2e/build/test_build_output_file_hashes_data/.buckconfig rename to tests/core/build/test_build_output_file_hashes_data/.buckconfig diff --git a/tests/e2e/build/test_build_output_file_hashes_data/TARGETS.fixture b/tests/core/build/test_build_output_file_hashes_data/TARGETS.fixture similarity index 100% rename from tests/e2e/build/test_build_output_file_hashes_data/TARGETS.fixture rename to tests/core/build/test_build_output_file_hashes_data/TARGETS.fixture diff --git a/tests/e2e/build/test_build_output_file_hashes_data/file.txt b/tests/core/build/test_build_output_file_hashes_data/file.txt similarity index 100% rename from tests/e2e/build/test_build_output_file_hashes_data/file.txt rename to tests/core/build/test_build_output_file_hashes_data/file.txt diff --git a/tests/e2e/build/test_build_output_file_hashes_data/folder/file_in_folder.txt b/tests/core/build/test_build_output_file_hashes_data/folder/file_in_folder.txt similarity index 100% rename from tests/e2e/build/test_build_output_file_hashes_data/folder/file_in_folder.txt rename to tests/core/build/test_build_output_file_hashes_data/folder/file_in_folder.txt diff --git a/tests/e2e/build/test_build_report.py b/tests/core/build/test_build_report.py similarity index 98% rename from tests/e2e/build/test_build_report.py rename to tests/core/build/test_build_report.py index 91ff00d919bc..20d66ae33214 100644 --- a/tests/e2e/build/test_build_report.py +++ b/tests/core/build/test_build_report.py @@ -15,7 +15,7 @@ from buck2.tests.e2e_util.helper.utils import replace_hashes -@buck_test(inplace=False) +@buck_test() async def test_build_report_format(buck: Buck) -> None: await buck.build( "//:rule1", @@ -73,7 +73,7 @@ async def test_build_report_format(buck: Buck) -> None: assert rule2_configured["configured_graph_size"] == 3 -@buck_test(inplace=False) +@buck_test() async def test_build_report_format_skip_unconfigured(buck: Buck) -> None: await buck.build( "//:rule1", @@ -102,7 +102,7 @@ async def test_build_report_format_skip_unconfigured(buck: Buck) -> None: assert rule1_configured["other_outputs"] == {} -@buck_test(inplace=False) +@buck_test() async def test_build_report_package_project_relative_path(buck: Buck) -> None: await buck.build( "//:rule1", diff --git a/tests/e2e/build/test_build_report_data/.buckconfig b/tests/core/build/test_build_report_data/.buckconfig similarity index 100% rename from tests/e2e/build/test_build_report_data/.buckconfig rename to tests/core/build/test_build_report_data/.buckconfig diff --git a/tests/e2e/build/test_build_report_data/TARGETS.fixture b/tests/core/build/test_build_report_data/TARGETS.fixture similarity index 100% rename from tests/e2e/build/test_build_report_data/TARGETS.fixture rename to tests/core/build/test_build_report_data/TARGETS.fixture diff --git a/tests/e2e/build/test_build_report_data/rules.bzl b/tests/core/build/test_build_report_data/rules.bzl similarity index 100% rename from tests/e2e/build/test_build_report_data/rules.bzl rename to tests/core/build/test_build_report_data/rules.bzl diff --git a/tests/e2e/build/test_build_report_data/subdir/TARGETS.fixture b/tests/core/build/test_build_report_data/subdir/TARGETS.fixture similarity index 100% rename from tests/e2e/build/test_build_report_data/subdir/TARGETS.fixture rename to tests/core/build/test_build_report_data/subdir/TARGETS.fixture diff --git a/tests/e2e/build/test_build_report_errors.py b/tests/core/build/test_build_report_errors.py similarity index 97% rename from tests/e2e/build/test_build_report_errors.py rename to tests/core/build/test_build_report_errors.py index 8d110374814f..01acb3837d5b 100644 --- a/tests/e2e/build/test_build_report_errors.py +++ b/tests/core/build/test_build_report_errors.py @@ -92,7 +92,7 @@ async def impl(buck: Buck, tmp_path: Path) -> None: globals()[name] = impl - return buck_test(inplace=False)(impl) + return buck_test()(impl) build_report_test( @@ -149,7 +149,7 @@ def running_on_mac() -> bool: ["//fail_action:fail_one_with_error_handler_no_op"], ) - @buck_test(inplace=False) + @buck_test() async def test_stderr_with_empty_error_diagnostics(buck: Buck) -> None: result = await expect_failure( buck.build("//fail_action:fail_one_with_error_handler_no_op") @@ -160,7 +160,7 @@ async def test_stderr_with_empty_error_diagnostics(buck: Buck) -> None: rel_path="fixtures/test_stderr_with_empty_error_diagnostics.golden.txt", ) - @buck_test(inplace=False) + @buck_test() async def test_stderr_with_error_diagnostics(buck: Buck) -> None: result = await expect_failure( buck.build("//fail_action:error_handler_produced_multiple_categories") @@ -171,7 +171,7 @@ async def test_stderr_with_error_diagnostics(buck: Buck) -> None: rel_path="fixtures/test_stderr_with_error_diagnostics.golden.txt", ) - @buck_test(inplace=False) + @buck_test() async def test_stderr_with_no_error_diagnostics(buck: Buck) -> None: result = await expect_failure(buck.build("//fail_action:fail_script")) @@ -180,7 +180,7 @@ async def test_stderr_with_no_error_diagnostics(buck: Buck) -> None: rel_path="fixtures/test_stderr_with_no_error_diagnostics.golden.txt", ) - @buck_test(inplace=False) + @buck_test() async def test_stderr_could_not_produce_error_diagnostics(buck: Buck) -> None: result = await expect_failure(buck.build("//fail_action:error_handler_failed")) @@ -251,7 +251,7 @@ async def test_stderr_could_not_produce_error_diagnostics(buck: Buck) -> None: ) -@buck_test(inplace=False, setup_eden=True) +@buck_test(setup_eden=True) async def test_two_action_dep_failures(buck: Buck, tmp_path: Path) -> None: # When we pass `--keep-going`, we should get error reports for both dependencies of the action. # However, we don't. Instead, we just get one error non-deterministically. This is also why we @@ -279,7 +279,7 @@ async def test_two_action_dep_failures(buck: Buck, tmp_path: Path) -> None: assert "fail_two_deps" in errors[0]["action_error"]["key"]["owner"] -@buck_test(inplace=False) +@buck_test() async def test_error_handler_failed(buck: Buck, tmp_path: Path) -> None: # Starlark error messages change across different modes for some reason (ex: opt-asan vs opt). # We have a fair amount of coverage for other functionalities of error handler/build report, @@ -302,7 +302,7 @@ async def test_error_handler_failed(buck: Buck, tmp_path: Path) -> None: assert "fail: something went wrong" in report -@buck_test(inplace=False) +@buck_test() async def test_error_handler_wrong_return_type(buck: Buck, tmp_path: Path) -> None: # Starlark error messages change across different modes for some reason (ex: opt-asan vs opt). # We have a fair amount of coverage for other functionalities of error handler/build report, @@ -328,7 +328,7 @@ async def test_error_handler_wrong_return_type(buck: Buck, tmp_path: Path) -> No ) -@buck_test(inplace=False) +@buck_test() async def test_missing_report_on_wrong_package(buck: Buck, tmp_path: Path) -> None: # If we specify a non-existent package, we don't get an error report report = tmp_path / "build-report.json" diff --git a/tests/e2e/build/test_build_report_errors_data/.buckconfig b/tests/core/build/test_build_report_errors_data/.buckconfig similarity index 100% rename from tests/e2e/build/test_build_report_errors_data/.buckconfig rename to tests/core/build/test_build_report_errors_data/.buckconfig diff --git a/tests/e2e/build/test_build_report_errors_data/.buckroot b/tests/core/build/test_build_report_errors_data/.buckroot similarity index 100% rename from tests/e2e/build/test_build_report_errors_data/.buckroot rename to tests/core/build/test_build_report_errors_data/.buckroot diff --git a/tests/e2e/build/test_build_report_errors_data/config/TARGETS.fixture b/tests/core/build/test_build_report_errors_data/config/TARGETS.fixture similarity index 100% rename from tests/e2e/build/test_build_report_errors_data/config/TARGETS.fixture rename to tests/core/build/test_build_report_errors_data/config/TARGETS.fixture diff --git a/tests/e2e/build/test_build_report_errors_data/config/config_defs.bzl b/tests/core/build/test_build_report_errors_data/config/config_defs.bzl similarity index 100% rename from tests/e2e/build/test_build_report_errors_data/config/config_defs.bzl rename to tests/core/build/test_build_report_errors_data/config/config_defs.bzl diff --git a/tests/e2e/build/test_build_report_errors_data/fail_action/TARGETS.fixture b/tests/core/build/test_build_report_errors_data/fail_action/TARGETS.fixture similarity index 100% rename from tests/e2e/build/test_build_report_errors_data/fail_action/TARGETS.fixture rename to tests/core/build/test_build_report_errors_data/fail_action/TARGETS.fixture diff --git a/tests/e2e/build/test_build_report_errors_data/fail_action/fail_action.bzl b/tests/core/build/test_build_report_errors_data/fail_action/fail_action.bzl similarity index 100% rename from tests/e2e/build/test_build_report_errors_data/fail_action/fail_action.bzl rename to tests/core/build/test_build_report_errors_data/fail_action/fail_action.bzl diff --git a/tests/e2e/build/test_build_report_errors_data/fail_action/fail_action_with_error_handler.bzl b/tests/core/build/test_build_report_errors_data/fail_action/fail_action_with_error_handler.bzl similarity index 100% rename from tests/e2e/build/test_build_report_errors_data/fail_action/fail_action_with_error_handler.bzl rename to tests/core/build/test_build_report_errors_data/fail_action/fail_action_with_error_handler.bzl diff --git a/tests/e2e/build/test_build_report_errors_data/fail_action/fail_compile.py b/tests/core/build/test_build_report_errors_data/fail_action/fail_compile.py similarity index 100% rename from tests/e2e/build/test_build_report_errors_data/fail_action/fail_compile.py rename to tests/core/build/test_build_report_errors_data/fail_action/fail_compile.py diff --git a/tests/e2e/build/test_build_report_errors_data/fail_action/fail_indent.py b/tests/core/build/test_build_report_errors_data/fail_action/fail_indent.py similarity index 100% rename from tests/e2e/build/test_build_report_errors_data/fail_action/fail_indent.py rename to tests/core/build/test_build_report_errors_data/fail_action/fail_indent.py diff --git a/tests/e2e/build/test_build_report_errors_data/fail_analysis/TARGETS.fixture b/tests/core/build/test_build_report_errors_data/fail_analysis/TARGETS.fixture similarity index 100% rename from tests/e2e/build/test_build_report_errors_data/fail_analysis/TARGETS.fixture rename to tests/core/build/test_build_report_errors_data/fail_analysis/TARGETS.fixture diff --git a/tests/e2e/build/test_build_report_errors_data/fail_analysis/fail_analysis.bzl b/tests/core/build/test_build_report_errors_data/fail_analysis/fail_analysis.bzl similarity index 100% rename from tests/e2e/build/test_build_report_errors_data/fail_analysis/fail_analysis.bzl rename to tests/core/build/test_build_report_errors_data/fail_analysis/fail_analysis.bzl diff --git a/tests/e2e/build/test_build_report_errors_data/fail_config/TARGETS.fixture b/tests/core/build/test_build_report_errors_data/fail_config/TARGETS.fixture similarity index 100% rename from tests/e2e/build/test_build_report_errors_data/fail_config/TARGETS.fixture rename to tests/core/build/test_build_report_errors_data/fail_config/TARGETS.fixture diff --git a/tests/e2e/build/test_build_report_errors_data/fail_config/fail_config.bzl b/tests/core/build/test_build_report_errors_data/fail_config/fail_config.bzl similarity index 100% rename from tests/e2e/build/test_build_report_errors_data/fail_config/fail_config.bzl rename to tests/core/build/test_build_report_errors_data/fail_config/fail_config.bzl diff --git a/tests/e2e/build/test_build_report_errors_data/fail_load/TARGETS.fixture b/tests/core/build/test_build_report_errors_data/fail_load/TARGETS.fixture similarity index 100% rename from tests/e2e/build/test_build_report_errors_data/fail_load/TARGETS.fixture rename to tests/core/build/test_build_report_errors_data/fail_load/TARGETS.fixture diff --git a/tests/e2e/build/test_build_report_errors_data/fixtures/test_action_fail_many_with_error_handler.golden.json b/tests/core/build/test_build_report_errors_data/fixtures/test_action_fail_many_with_error_handler.golden.json similarity index 100% rename from tests/e2e/build/test_build_report_errors_data/fixtures/test_action_fail_many_with_error_handler.golden.json rename to tests/core/build/test_build_report_errors_data/fixtures/test_action_fail_many_with_error_handler.golden.json diff --git a/tests/e2e/build/test_build_report_errors_data/fixtures/test_action_fail_one.golden.json b/tests/core/build/test_build_report_errors_data/fixtures/test_action_fail_one.golden.json similarity index 100% rename from tests/e2e/build/test_build_report_errors_data/fixtures/test_action_fail_one.golden.json rename to tests/core/build/test_build_report_errors_data/fixtures/test_action_fail_one.golden.json diff --git a/tests/e2e/build/test_build_report_errors_data/fixtures/test_action_fail_one_with_error_handler.golden.json b/tests/core/build/test_build_report_errors_data/fixtures/test_action_fail_one_with_error_handler.golden.json similarity index 100% rename from tests/e2e/build/test_build_report_errors_data/fixtures/test_action_fail_one_with_error_handler.golden.json rename to tests/core/build/test_build_report_errors_data/fixtures/test_action_fail_one_with_error_handler.golden.json diff --git a/tests/e2e/build/test_build_report_errors_data/fixtures/test_action_fail_one_with_error_handler_no_op.golden.json b/tests/core/build/test_build_report_errors_data/fixtures/test_action_fail_one_with_error_handler_no_op.golden.json similarity index 100% rename from tests/e2e/build/test_build_report_errors_data/fixtures/test_action_fail_one_with_error_handler_no_op.golden.json rename to tests/core/build/test_build_report_errors_data/fixtures/test_action_fail_one_with_error_handler_no_op.golden.json diff --git a/tests/e2e/build/test_build_report_errors_data/fixtures/test_action_fail_shared_across_targets.golden.json b/tests/core/build/test_build_report_errors_data/fixtures/test_action_fail_shared_across_targets.golden.json similarity index 100% rename from tests/e2e/build/test_build_report_errors_data/fixtures/test_action_fail_shared_across_targets.golden.json rename to tests/core/build/test_build_report_errors_data/fixtures/test_action_fail_shared_across_targets.golden.json diff --git a/tests/e2e/build/test_build_report_errors_data/fixtures/test_action_fail_shared_dep.golden.json b/tests/core/build/test_build_report_errors_data/fixtures/test_action_fail_shared_dep.golden.json similarity index 100% rename from tests/e2e/build/test_build_report_errors_data/fixtures/test_action_fail_shared_dep.golden.json rename to tests/core/build/test_build_report_errors_data/fixtures/test_action_fail_shared_dep.golden.json diff --git a/tests/e2e/build/test_build_report_errors_data/fixtures/test_action_fail_two.golden.json b/tests/core/build/test_build_report_errors_data/fixtures/test_action_fail_two.golden.json similarity index 100% rename from tests/e2e/build/test_build_report_errors_data/fixtures/test_action_fail_two.golden.json rename to tests/core/build/test_build_report_errors_data/fixtures/test_action_fail_two.golden.json diff --git a/tests/e2e/build/test_build_report_errors_data/fixtures/test_action_fail_with_stdout_stderr.golden.json b/tests/core/build/test_build_report_errors_data/fixtures/test_action_fail_with_stdout_stderr.golden.json similarity index 100% rename from tests/e2e/build/test_build_report_errors_data/fixtures/test_action_fail_with_stdout_stderr.golden.json rename to tests/core/build/test_build_report_errors_data/fixtures/test_action_fail_with_stdout_stderr.golden.json diff --git a/tests/e2e/build/test_build_report_errors_data/fixtures/test_analysis_and_action.golden.json b/tests/core/build/test_build_report_errors_data/fixtures/test_analysis_and_action.golden.json similarity index 100% rename from tests/e2e/build/test_build_report_errors_data/fixtures/test_analysis_and_action.golden.json rename to tests/core/build/test_build_report_errors_data/fixtures/test_analysis_and_action.golden.json diff --git a/tests/e2e/build/test_build_report_errors_data/fixtures/test_analysis_fail.golden.json b/tests/core/build/test_build_report_errors_data/fixtures/test_analysis_fail.golden.json similarity index 100% rename from tests/e2e/build/test_build_report_errors_data/fixtures/test_analysis_fail.golden.json rename to tests/core/build/test_build_report_errors_data/fixtures/test_analysis_fail.golden.json diff --git a/tests/e2e/build/test_build_report_errors_data/fixtures/test_analysis_fail_multi.golden.json b/tests/core/build/test_build_report_errors_data/fixtures/test_analysis_fail_multi.golden.json similarity index 100% rename from tests/e2e/build/test_build_report_errors_data/fixtures/test_analysis_fail_multi.golden.json rename to tests/core/build/test_build_report_errors_data/fixtures/test_analysis_fail_multi.golden.json diff --git a/tests/e2e/build/test_build_report_errors_data/fixtures/test_configuration_fail.golden.json b/tests/core/build/test_build_report_errors_data/fixtures/test_configuration_fail.golden.json similarity index 100% rename from tests/e2e/build/test_build_report_errors_data/fixtures/test_configuration_fail.golden.json rename to tests/core/build/test_build_report_errors_data/fixtures/test_configuration_fail.golden.json diff --git a/tests/e2e/build/test_build_report_errors_data/fixtures/test_load_fail.golden.json b/tests/core/build/test_build_report_errors_data/fixtures/test_load_fail.golden.json similarity index 100% rename from tests/e2e/build/test_build_report_errors_data/fixtures/test_load_fail.golden.json rename to tests/core/build/test_build_report_errors_data/fixtures/test_load_fail.golden.json diff --git a/tests/e2e/build/test_build_report_errors_data/fixtures/test_load_fail_full_package.golden.json b/tests/core/build/test_build_report_errors_data/fixtures/test_load_fail_full_package.golden.json similarity index 100% rename from tests/e2e/build/test_build_report_errors_data/fixtures/test_load_fail_full_package.golden.json rename to tests/core/build/test_build_report_errors_data/fixtures/test_load_fail_full_package.golden.json diff --git a/tests/e2e/build/test_build_report_errors_data/fixtures/test_missing.golden.json b/tests/core/build/test_build_report_errors_data/fixtures/test_missing.golden.json similarity index 100% rename from tests/e2e/build/test_build_report_errors_data/fixtures/test_missing.golden.json rename to tests/core/build/test_build_report_errors_data/fixtures/test_missing.golden.json diff --git a/tests/e2e/build/test_build_report_errors_data/fixtures/test_no_terminal_colors.golden.json b/tests/core/build/test_build_report_errors_data/fixtures/test_no_terminal_colors.golden.json similarity index 100% rename from tests/e2e/build/test_build_report_errors_data/fixtures/test_no_terminal_colors.golden.json rename to tests/core/build/test_build_report_errors_data/fixtures/test_no_terminal_colors.golden.json diff --git a/tests/e2e/build/test_build_report_errors_data/fixtures/test_one_of_each.golden.json b/tests/core/build/test_build_report_errors_data/fixtures/test_one_of_each.golden.json similarity index 100% rename from tests/e2e/build/test_build_report_errors_data/fixtures/test_one_of_each.golden.json rename to tests/core/build/test_build_report_errors_data/fixtures/test_one_of_each.golden.json diff --git a/tests/e2e/build/test_build_report_errors_data/fixtures/test_partially_missing.golden.json b/tests/core/build/test_build_report_errors_data/fixtures/test_partially_missing.golden.json similarity index 100% rename from tests/e2e/build/test_build_report_errors_data/fixtures/test_partially_missing.golden.json rename to tests/core/build/test_build_report_errors_data/fixtures/test_partially_missing.golden.json diff --git a/tests/e2e/build/test_build_report_errors_data/fixtures/test_stderr_could_not_produce_error_diagnostics.golden.txt b/tests/core/build/test_build_report_errors_data/fixtures/test_stderr_could_not_produce_error_diagnostics.golden.txt similarity index 100% rename from tests/e2e/build/test_build_report_errors_data/fixtures/test_stderr_could_not_produce_error_diagnostics.golden.txt rename to tests/core/build/test_build_report_errors_data/fixtures/test_stderr_could_not_produce_error_diagnostics.golden.txt diff --git a/tests/e2e/build/test_build_report_errors_data/fixtures/test_stderr_with_empty_error_diagnostics.golden.txt b/tests/core/build/test_build_report_errors_data/fixtures/test_stderr_with_empty_error_diagnostics.golden.txt similarity index 100% rename from tests/e2e/build/test_build_report_errors_data/fixtures/test_stderr_with_empty_error_diagnostics.golden.txt rename to tests/core/build/test_build_report_errors_data/fixtures/test_stderr_with_empty_error_diagnostics.golden.txt diff --git a/tests/e2e/build/test_build_report_errors_data/fixtures/test_stderr_with_error_diagnostics.golden.txt b/tests/core/build/test_build_report_errors_data/fixtures/test_stderr_with_error_diagnostics.golden.txt similarity index 100% rename from tests/e2e/build/test_build_report_errors_data/fixtures/test_stderr_with_error_diagnostics.golden.txt rename to tests/core/build/test_build_report_errors_data/fixtures/test_stderr_with_error_diagnostics.golden.txt diff --git a/tests/e2e/build/test_build_report_errors_data/fixtures/test_stderr_with_no_error_diagnostics.golden.txt b/tests/core/build/test_build_report_errors_data/fixtures/test_stderr_with_no_error_diagnostics.golden.txt similarity index 100% rename from tests/e2e/build/test_build_report_errors_data/fixtures/test_stderr_with_no_error_diagnostics.golden.txt rename to tests/core/build/test_build_report_errors_data/fixtures/test_stderr_with_no_error_diagnostics.golden.txt diff --git a/tests/e2e/build/test_build_report_errors_data/missing/TARGETS.fixture b/tests/core/build/test_build_report_errors_data/missing/TARGETS.fixture similarity index 100% rename from tests/e2e/build/test_build_report_errors_data/missing/TARGETS.fixture rename to tests/core/build/test_build_report_errors_data/missing/TARGETS.fixture diff --git a/tests/e2e/build/test_build_report_errors_data/success/TARGETS.fixture b/tests/core/build/test_build_report_errors_data/success/TARGETS.fixture similarity index 100% rename from tests/e2e/build/test_build_report_errors_data/success/TARGETS.fixture rename to tests/core/build/test_build_report_errors_data/success/TARGETS.fixture diff --git a/tests/e2e/build/test_build_report_errors_data/success/success.bzl b/tests/core/build/test_build_report_errors_data/success/success.bzl similarity index 100% rename from tests/e2e/build/test_build_report_errors_data/success/success.bzl rename to tests/core/build/test_build_report_errors_data/success/success.bzl diff --git a/tests/e2e/build/test_build_report_errors_data/terminal_colors/TARGETS.fixture b/tests/core/build/test_build_report_errors_data/terminal_colors/TARGETS.fixture similarity index 100% rename from tests/e2e/build/test_build_report_errors_data/terminal_colors/TARGETS.fixture rename to tests/core/build/test_build_report_errors_data/terminal_colors/TARGETS.fixture diff --git a/tests/e2e/build/test_build_report_errors_data/terminal_colors/terminal_colors.bzl b/tests/core/build/test_build_report_errors_data/terminal_colors/terminal_colors.bzl similarity index 100% rename from tests/e2e/build/test_build_report_errors_data/terminal_colors/terminal_colors.bzl rename to tests/core/build/test_build_report_errors_data/terminal_colors/terminal_colors.bzl diff --git a/tests/e2e/build/test_build_report_errors_data/utils.bzl b/tests/core/build/test_build_report_errors_data/utils.bzl similarity index 100% rename from tests/e2e/build/test_build_report_errors_data/utils.bzl rename to tests/core/build/test_build_report_errors_data/utils.bzl diff --git a/tests/e2e/build/test_build_response.py b/tests/core/build/test_build_response.py similarity index 98% rename from tests/e2e/build/test_build_response.py rename to tests/core/build/test_build_response.py index 92ee283094f8..9c1d9875f5e0 100644 --- a/tests/e2e/build/test_build_response.py +++ b/tests/core/build/test_build_response.py @@ -41,7 +41,7 @@ async def check_targets( assert expected in actual_msg["message"] -@buck_test(inplace=False) +@buck_test() async def test_build_one_fails(buck: Buck, tmp_path: Path) -> None: report = tmp_path / "build-report.json" await expect_failure( diff --git a/tests/e2e/build/test_build_response_data/.buckconfig b/tests/core/build/test_build_response_data/.buckconfig similarity index 100% rename from tests/e2e/build/test_build_response_data/.buckconfig rename to tests/core/build/test_build_response_data/.buckconfig diff --git a/tests/e2e/build/test_build_response_data/TARGETS.fixture b/tests/core/build/test_build_response_data/TARGETS.fixture similarity index 100% rename from tests/e2e/build/test_build_response_data/TARGETS.fixture rename to tests/core/build/test_build_response_data/TARGETS.fixture diff --git a/tests/e2e/build/test_build_response_data/defs.bzl b/tests/core/build/test_build_response_data/defs.bzl similarity index 100% rename from tests/e2e/build/test_build_response_data/defs.bzl rename to tests/core/build/test_build_response_data/defs.bzl diff --git a/tests/e2e/build/test_build_root_executable.py b/tests/core/build/test_build_root_executable.py similarity index 94% rename from tests/e2e/build/test_build_root_executable.py rename to tests/core/build/test_build_root_executable.py index 728932997581..1a938f85ae3b 100644 --- a/tests/e2e/build/test_build_root_executable.py +++ b/tests/core/build/test_build_root_executable.py @@ -18,11 +18,11 @@ """ -@buck_test(inplace=False) +@buck_test() async def test_build_root_executable_local(buck: Buck) -> None: await buck.build(":top", "--local-only") -@buck_test(inplace=False) +@buck_test() async def test_build_root_executable_remote(buck: Buck) -> None: await buck.build(":top", "--remote-only") diff --git a/tests/e2e/build/test_build_root_executable_data/.buckconfig b/tests/core/build/test_build_root_executable_data/.buckconfig similarity index 100% rename from tests/e2e/build/test_build_root_executable_data/.buckconfig rename to tests/core/build/test_build_root_executable_data/.buckconfig diff --git a/tests/e2e/build/test_build_root_executable_data/TARGETS.fixture b/tests/core/build/test_build_root_executable_data/TARGETS.fixture similarity index 100% rename from tests/e2e/build/test_build_root_executable_data/TARGETS.fixture rename to tests/core/build/test_build_root_executable_data/TARGETS.fixture diff --git a/tests/e2e/build/test_build_root_executable_data/defs.bzl b/tests/core/build/test_build_root_executable_data/defs.bzl similarity index 100% rename from tests/e2e/build/test_build_root_executable_data/defs.bzl rename to tests/core/build/test_build_root_executable_data/defs.bzl diff --git a/tests/e2e/build/test_build_root_executable_data/prelude.bzl b/tests/core/build/test_build_root_executable_data/prelude.bzl similarity index 100% rename from tests/e2e/build/test_build_root_executable_data/prelude.bzl rename to tests/core/build/test_build_root_executable_data/prelude.bzl diff --git a/tests/e2e/build/test_build_root_executable_data/touch.bat b/tests/core/build/test_build_root_executable_data/touch.bat similarity index 100% rename from tests/e2e/build/test_build_root_executable_data/touch.bat rename to tests/core/build/test_build_root_executable_data/touch.bat diff --git a/tests/e2e/build/test_build_root_executable_data/touch.sh b/tests/core/build/test_build_root_executable_data/touch.sh similarity index 100% rename from tests/e2e/build/test_build_root_executable_data/touch.sh rename to tests/core/build/test_build_root_executable_data/touch.sh diff --git a/tests/e2e/build/test_build_rule_type_name_logging.py b/tests/core/build/test_build_rule_type_name_logging.py similarity index 93% rename from tests/e2e/build/test_build_rule_type_name_logging.py rename to tests/core/build/test_build_rule_type_name_logging.py index fd4a12ecf652..a57453c35fa7 100644 --- a/tests/e2e/build/test_build_rule_type_name_logging.py +++ b/tests/core/build/test_build_rule_type_name_logging.py @@ -32,7 +32,7 @@ async def check_rule_type_names( assert actual["target_rule_type_name"] == expected -@buck_test(inplace=False) +@buck_test() async def test_build_nested_subtargets(buck: Buck) -> None: await buck.build( "//:nested[sub][nested_sub]", @@ -40,7 +40,7 @@ async def test_build_nested_subtargets(buck: Buck) -> None: await check_rule_type_names(buck, ["nested_subtargets"]) -@buck_test(inplace=False) +@buck_test() async def test_build_single_dep_touch(buck: Buck) -> None: await buck.build( "//:rule1", @@ -48,7 +48,7 @@ async def test_build_single_dep_touch(buck: Buck) -> None: await check_rule_type_names(buck, ["one"]) -@buck_test(inplace=False) +@buck_test() async def test_build_two_out_of_order(buck: Buck) -> None: await buck.build( "//:rule1", @@ -57,7 +57,7 @@ async def test_build_two_out_of_order(buck: Buck) -> None: await check_rule_type_names(buck, ["nested_subtargets", "one"]) -@buck_test(inplace=False) +@buck_test() async def test_build_all_in_target(buck: Buck) -> None: await buck.build( "//:", @@ -65,7 +65,7 @@ async def test_build_all_in_target(buck: Buck) -> None: await check_rule_type_names(buck, ["two", "nested_subtargets", "one", "one"]) -@buck_test(inplace=False) +@buck_test() async def test_build_all_recursive(buck: Buck) -> None: await buck.build( "//...", diff --git a/tests/e2e/build/test_build_rule_type_name_logging_data/.buckconfig b/tests/core/build/test_build_rule_type_name_logging_data/.buckconfig similarity index 100% rename from tests/e2e/build/test_build_rule_type_name_logging_data/.buckconfig rename to tests/core/build/test_build_rule_type_name_logging_data/.buckconfig diff --git a/tests/e2e/build/test_build_rule_type_name_logging_data/TARGETS.fixture b/tests/core/build/test_build_rule_type_name_logging_data/TARGETS.fixture similarity index 100% rename from tests/e2e/build/test_build_rule_type_name_logging_data/TARGETS.fixture rename to tests/core/build/test_build_rule_type_name_logging_data/TARGETS.fixture diff --git a/tests/e2e/build/test_build_rule_type_name_logging_data/defs.bzl b/tests/core/build/test_build_rule_type_name_logging_data/defs.bzl similarity index 100% rename from tests/e2e/build/test_build_rule_type_name_logging_data/defs.bzl rename to tests/core/build/test_build_rule_type_name_logging_data/defs.bzl diff --git a/tests/e2e/build/test_build_skip_incompatible_targets.py b/tests/core/build/test_build_skip_incompatible_targets.py similarity index 98% rename from tests/e2e/build/test_build_skip_incompatible_targets.py rename to tests/core/build/test_build_skip_incompatible_targets.py index 47f0e26a2a4b..091cbd2eefeb 100644 --- a/tests/e2e/build/test_build_skip_incompatible_targets.py +++ b/tests/core/build/test_build_skip_incompatible_targets.py @@ -14,7 +14,7 @@ from buck2.tests.e2e_util.buck_workspace import buck_test -@buck_test(inplace=False) +@buck_test() async def test_build_skip_incompatible(buck: Buck) -> None: targetA = "root//:compatible-with-A" targetB = "root//:compatible-with-B" diff --git a/tests/e2e/build/test_build_skip_incompatible_targets_data/.buckconfig b/tests/core/build/test_build_skip_incompatible_targets_data/.buckconfig similarity index 100% rename from tests/e2e/build/test_build_skip_incompatible_targets_data/.buckconfig rename to tests/core/build/test_build_skip_incompatible_targets_data/.buckconfig diff --git a/tests/e2e/build/test_build_skip_incompatible_targets_data/.buckroot b/tests/core/build/test_build_skip_incompatible_targets_data/.buckroot similarity index 100% rename from tests/e2e/build/test_build_skip_incompatible_targets_data/.buckroot rename to tests/core/build/test_build_skip_incompatible_targets_data/.buckroot diff --git a/tests/e2e/build/test_build_skip_incompatible_targets_data/TARGETS.fixture b/tests/core/build/test_build_skip_incompatible_targets_data/TARGETS.fixture similarity index 100% rename from tests/e2e/build/test_build_skip_incompatible_targets_data/TARGETS.fixture rename to tests/core/build/test_build_skip_incompatible_targets_data/TARGETS.fixture diff --git a/tests/e2e/build/test_build_system_info.py b/tests/core/build/test_build_system_info.py similarity index 96% rename from tests/e2e/build/test_build_system_info.py rename to tests/core/build/test_build_system_info.py index 6d9105c771b0..d470f293e05c 100644 --- a/tests/e2e/build/test_build_system_info.py +++ b/tests/core/build/test_build_system_info.py @@ -12,9 +12,7 @@ from buck2.tests.e2e_util.helper.utils import filter_events -@buck_test( - inplace=False, -) +@buck_test() async def test_build_system_info(buck: Buck) -> None: await buck.build( "//:test", diff --git a/tests/e2e/build/test_build_system_info_data/.buckconfig b/tests/core/build/test_build_system_info_data/.buckconfig similarity index 100% rename from tests/e2e/build/test_build_system_info_data/.buckconfig rename to tests/core/build/test_build_system_info_data/.buckconfig diff --git a/tests/e2e/build/test_build_system_info_data/.buckroot b/tests/core/build/test_build_system_info_data/.buckroot similarity index 100% rename from tests/e2e/build/test_build_system_info_data/.buckroot rename to tests/core/build/test_build_system_info_data/.buckroot diff --git a/tests/e2e/build/test_build_system_info_data/TARGETS.fixture b/tests/core/build/test_build_system_info_data/TARGETS.fixture similarity index 100% rename from tests/e2e/build/test_build_system_info_data/TARGETS.fixture rename to tests/core/build/test_build_system_info_data/TARGETS.fixture diff --git a/tests/e2e/build/test_cancellation.py b/tests/core/build/test_cancellation.py similarity index 97% rename from tests/e2e/build/test_cancellation.py rename to tests/core/build/test_cancellation.py index 0aa577bd7fdb..fc86094a2463 100644 --- a/tests/e2e/build/test_cancellation.py +++ b/tests/core/build/test_cancellation.py @@ -63,14 +63,14 @@ async def _test_cancellation_helper( raise Exception(f"PID existed: {pid}") -@buck_test(inplace=False) +@buck_test() async def test_cancellation(buck: Buck, tmp_path: Path) -> None: await _test_cancellation_helper( buck, tmp_path, lambda buck, opts: buck.build(*opts, ":slow") ) -@buck_test(inplace=False) +@buck_test() async def test_cancellation_bxl(buck: Buck, tmp_path: Path) -> None: await _test_cancellation_helper( buck, tmp_path, lambda buck, opts: buck.bxl(*opts, "//build.bxl:build") diff --git a/tests/e2e/build/test_cancellation_data/.buckconfig b/tests/core/build/test_cancellation_data/.buckconfig similarity index 100% rename from tests/e2e/build/test_cancellation_data/.buckconfig rename to tests/core/build/test_cancellation_data/.buckconfig diff --git a/tests/e2e/build/test_cancellation_data/TARGETS.fixture b/tests/core/build/test_cancellation_data/TARGETS.fixture similarity index 100% rename from tests/e2e/build/test_cancellation_data/TARGETS.fixture rename to tests/core/build/test_cancellation_data/TARGETS.fixture diff --git a/tests/e2e/build/test_cancellation_data/build.bxl b/tests/core/build/test_cancellation_data/build.bxl similarity index 100% rename from tests/e2e/build/test_cancellation_data/build.bxl rename to tests/core/build/test_cancellation_data/build.bxl diff --git a/tests/e2e/build/test_cancellation_data/defs.bzl b/tests/core/build/test_cancellation_data/defs.bzl similarity index 100% rename from tests/e2e/build/test_cancellation_data/defs.bzl rename to tests/core/build/test_cancellation_data/defs.bzl diff --git a/tests/e2e/build/test_cancellation_data/prelude/prelude.bzl b/tests/core/build/test_cancellation_data/prelude/prelude.bzl similarity index 100% rename from tests/e2e/build/test_cancellation_data/prelude/prelude.bzl rename to tests/core/build/test_cancellation_data/prelude/prelude.bzl diff --git a/tests/e2e/build/test_cancellation_data/slow.py b/tests/core/build/test_cancellation_data/slow.py similarity index 100% rename from tests/e2e/build/test_cancellation_data/slow.py rename to tests/core/build/test_cancellation_data/slow.py diff --git a/tests/e2e/build/test_critical_path.py b/tests/core/build/test_critical_path.py similarity index 97% rename from tests/e2e/build/test_critical_path.py rename to tests/core/build/test_critical_path.py index a6709e9b2ead..945647f355c0 100644 --- a/tests/e2e/build/test_critical_path.py +++ b/tests/core/build/test_critical_path.py @@ -72,12 +72,12 @@ async def do_critical_path(buck: Buck, correct_analysis: bool) -> None: assert s.name == e[1] -@buck_test(inplace=False) +@buck_test() async def test_critical_path(buck: Buck) -> None: await do_critical_path(buck, False) -@buck_test(inplace=False) +@buck_test() async def test_critical_path_longest_path_graph(buck: Buck) -> None: with open(buck.cwd / ".buckconfig", "a") as f: f.write("[buck2]\n") @@ -85,7 +85,7 @@ async def test_critical_path_longest_path_graph(buck: Buck) -> None: await do_critical_path(buck, True) -@buck_test(inplace=False) +@buck_test() async def test_critical_path_json(buck: Buck) -> None: import json @@ -137,7 +137,7 @@ async def test_critical_path_json(buck: Buck) -> None: assert "execution_kind" not in critical -@buck_test(inplace=False) +@buck_test() async def test_critical_path_metadata(buck: Buck) -> None: await buck.build( "//:step_0", @@ -178,7 +178,7 @@ async def critical_path_helper(buck: Buck) -> typing.List[typing.Dict[str, typin return critical_path_actions[0] -@buck_test(inplace=False) +@buck_test() async def test_critical_path_execution_kind(buck: Buck) -> None: await buck.build("//:step_3", "--no-remote-cache") @@ -197,7 +197,7 @@ async def test_critical_path_execution_kind(buck: Buck) -> None: assert has_action_execution -@buck_test(inplace=False) +@buck_test() async def test_critical_path_rule_type(buck: Buck) -> None: await buck.build("//:step_0", "--no-remote-cache") @@ -213,7 +213,7 @@ async def test_critical_path_rule_type(buck: Buck) -> None: ) -@buck_test(inplace=False) +@buck_test() async def test_critical_path_action_digest(buck: Buck) -> None: await buck.build("//:step_3", "--no-remote-cache") diff --git a/tests/e2e/build/test_critical_path_data/.buckconfig b/tests/core/build/test_critical_path_data/.buckconfig similarity index 100% rename from tests/e2e/build/test_critical_path_data/.buckconfig rename to tests/core/build/test_critical_path_data/.buckconfig diff --git a/tests/e2e/build/test_critical_path_data/.buckroot b/tests/core/build/test_critical_path_data/.buckroot similarity index 100% rename from tests/e2e/build/test_critical_path_data/.buckroot rename to tests/core/build/test_critical_path_data/.buckroot diff --git a/tests/e2e/build/test_critical_path_data/TARGETS.fixture b/tests/core/build/test_critical_path_data/TARGETS.fixture similarity index 100% rename from tests/e2e/build/test_critical_path_data/TARGETS.fixture rename to tests/core/build/test_critical_path_data/TARGETS.fixture diff --git a/tests/e2e/build/test_critical_path_data/prelude/prelude.bzl b/tests/core/build/test_critical_path_data/prelude/prelude.bzl similarity index 100% rename from tests/e2e/build/test_critical_path_data/prelude/prelude.bzl rename to tests/core/build/test_critical_path_data/prelude/prelude.bzl diff --git a/tests/e2e/build/test_dep_files.py b/tests/core/build/test_dep_files.py similarity index 96% rename from tests/e2e/build/test_dep_files.py rename to tests/core/build/test_dep_files.py index b84139d9c5dd..79958db7a285 100644 --- a/tests/e2e/build/test_dep_files.py +++ b/tests/core/build/test_dep_files.py @@ -103,7 +103,7 @@ def touch(buck: Buck, name: str) -> None: # Flaky because of watchman on mac (and maybe windows) # Skipping on windows due to gcc dependency -@buck_test(inplace=False, data_dir="dep_files", skip_for_os=["darwin", "windows"]) +@buck_test(data_dir="dep_files", skip_for_os=["darwin", "windows"]) async def test_dep_files(buck: Buck) -> None: # We query cache before we query dep file. Disable remote cache to make # sure that for the last build what-ran doesn't return cached entry. @@ -150,9 +150,7 @@ async def check_cache_query(buck: Buck) -> None: # Skipping on windows due to gcc dependency -@buck_test( - inplace=False, setup_eden=True, data_dir="dep_files", skip_for_os=["windows"] -) +@buck_test(setup_eden=True, data_dir="dep_files", skip_for_os=["windows"]) async def test_dep_file_hit_identical_action(buck: Buck) -> None: # For actions that have dep files, buck will query the local dep file cache to see # if an identical action is stored there. Otherwise, it will fall back to an action cache @@ -195,7 +193,7 @@ async def test_dep_file_hit_identical_action(buck: Buck) -> None: # Flaky because of watchman on mac (and maybe windows) # Skipping on windows due to gcc dependency # This test tombstones the hash of the dep file produced by this action. -@buck_test(inplace=False, data_dir="dep_files", skip_for_os=["darwin", "windows"]) +@buck_test(data_dir="dep_files", skip_for_os=["darwin", "windows"]) @env( "BUCK2_TEST_TOMBSTONED_DIGESTS", "ed34019d42934db589d9678e6e2d0cdff739e7e2:78", @@ -223,7 +221,7 @@ async def test_dep_files_ignore_missing_digests(buck: Buck, tmp_path: Path) -> N await expect_exec_count(buck, 1) -@buck_test(inplace=False, data_dir="invalid_dep_files") +@buck_test(data_dir="invalid_dep_files") async def test_invalid_dep_files(buck: Buck) -> None: await buck.build( "//:lazy", @@ -253,7 +251,7 @@ async def test_invalid_dep_files(buck: Buck) -> None: ) -@buck_test(inplace=False, data_dir="mismatched_outputs_dep_files") +@buck_test(data_dir="mismatched_outputs_dep_files") async def test_mismatched_outputs_dep_files(buck: Buck) -> None: await buck.build("//:test", "-c", "test.prefix=foo", "-c", "test.suffix=bar") # Different output now, even though the command has not changed. @@ -289,7 +287,7 @@ async def _check_uploaded_dep_file_key(buck: Buck, dep_file_key: str) -> None: assert dep_file_key == uploaded_key -@buck_test(inplace=False, data_dir="upload_dep_files") +@buck_test(data_dir="upload_dep_files") @env("BUCK_LOG", "buck2_execute_impl::executors::caching=debug") @env("BUCK2_TEST_SKIP_ACTION_CACHE_WRITE", "true") async def test_re_dep_file_uploads_same_key(buck: Buck) -> None: @@ -326,7 +324,7 @@ async def test_re_dep_file_uploads_same_key(buck: Buck) -> None: assert key == key_tagged_input_change -@buck_test(inplace=False, data_dir="upload_dep_files") +@buck_test(data_dir="upload_dep_files") @env("BUCK_LOG", "buck2_execute_impl::executors::caching=debug") @env("BUCK2_TEST_SKIP_ACTION_CACHE_WRITE", "true") async def test_re_dep_file_uploads_different_key(buck: Buck) -> None: @@ -387,7 +385,7 @@ async def test_re_dep_file_uploads_different_key(buck: Buck) -> None: keys_seen.append(key_untagged_input_change) -@buck_test(inplace=False, data_dir="upload_dep_files") +@buck_test(data_dir="upload_dep_files") @env("BUCK_LOG", "buck2_execute_impl::executors::caching=debug") @env("BUCK2_TEST_SKIP_ACTION_CACHE_WRITE", "true") async def test_dep_file_does_not_upload_when_allow_cache_upload_is_true( @@ -411,7 +409,7 @@ async def test_dep_file_does_not_upload_when_allow_cache_upload_is_true( assert len(uploads) == 0 -@buck_test(inplace=False, data_dir="upload_dep_files") +@buck_test(data_dir="upload_dep_files") @env("BUCK_LOG", "buck2_execute_impl::executors::caching=debug") @env("BUCK2_TEST_SKIP_ACTION_CACHE_WRITE", "true") @env("BUCK2_TEST_ONLY_REMOTE_DEP_FILE_CACHE", "true") @@ -449,7 +447,7 @@ async def test_only_do_cache_lookup_when_dep_file_upload_is_enabled( await check_cache_query(buck) -@buck_test(inplace=False, data_dir="upload_dep_files") +@buck_test(data_dir="upload_dep_files") @env("BUCK_LOG", "buck2_execute_impl::executors::caching=debug") @env("BUCK2_TEST_SKIP_ACTION_CACHE_WRITE", "true") async def test_re_dep_file_remote_upload(buck: Buck) -> None: @@ -468,7 +466,7 @@ async def test_re_dep_file_remote_upload(buck: Buck) -> None: await _check_uploaded_dep_file_key(buck, key) -@buck_test(inplace=False, data_dir="upload_dep_files") +@buck_test(data_dir="upload_dep_files") @env("BUCK_LOG", "buck2_action_impl=debug,buck2_execute_impl::executors::caching=debug") @env("BUCK2_TEST_SKIP_ACTION_CACHE_WRITE", "true") async def test_re_dep_file_cache_hit_upload(buck: Buck, tmpdir: Path) -> None: @@ -523,7 +521,7 @@ async def test_re_dep_file_cache_hit_upload(buck: Buck, tmpdir: Path) -> None: assert len(uploads) == 0 -@buck_test(inplace=False, data_dir="upload_dep_files") +@buck_test(data_dir="upload_dep_files") async def test_re_dep_file_uploads_failed_action(buck: Buck) -> None: # If the action failed, we should not attempt to upload to cache even if it's configured to target = [ @@ -551,7 +549,7 @@ async def check_remote_dep_file_cache_query_took_place(buck: Buck) -> str: return what_ran[0]["reproducer"]["details"]["digest"] -@buck_test(inplace=False, data_dir="upload_dep_files") +@buck_test(data_dir="upload_dep_files") @env( "BUCK_LOG", "buck2_execute_impl::executors::caching=debug,buck2_execute_impl::executors::action_cache=debug,buck2_action_impl=debug", @@ -630,7 +628,7 @@ async def test_re_dep_file_query_change_tagged_unused_file(buck: Buck) -> None: await check_match_dep_files(buck, expected_dep_file_match) -@buck_test(inplace=False, data_dir="upload_dep_files") +@buck_test(data_dir="upload_dep_files") @env( "BUCK_LOG", "buck2_execute_impl::executors::caching=debug,buck2_execute_impl::executors::action_cache=debug,buck2_action_impl=debug", diff --git a/tests/e2e/build/test_dep_files_data/dep_files/.buckconfig b/tests/core/build/test_dep_files_data/dep_files/.buckconfig similarity index 100% rename from tests/e2e/build/test_dep_files_data/dep_files/.buckconfig rename to tests/core/build/test_dep_files_data/dep_files/.buckconfig diff --git a/tests/e2e/build/test_dep_files_data/dep_files/app/TARGETS.fixture b/tests/core/build/test_dep_files_data/dep_files/app/TARGETS.fixture similarity index 100% rename from tests/e2e/build/test_dep_files_data/dep_files/app/TARGETS.fixture rename to tests/core/build/test_dep_files_data/dep_files/app/TARGETS.fixture diff --git a/tests/e2e/build/test_dep_files_data/dep_files/app/app.c b/tests/core/build/test_dep_files_data/dep_files/app/app.c similarity index 100% rename from tests/e2e/build/test_dep_files_data/dep_files/app/app.c rename to tests/core/build/test_dep_files_data/dep_files/app/app.c diff --git a/tests/e2e/build/test_dep_files_data/dep_files/app/app.h b/tests/core/build/test_dep_files_data/dep_files/app/app.h similarity index 100% rename from tests/e2e/build/test_dep_files_data/dep_files/app/app.h rename to tests/core/build/test_dep_files_data/dep_files/app/app.h diff --git a/tests/e2e/build/test_dep_files_data/dep_files/app/other.h b/tests/core/build/test_dep_files_data/dep_files/app/other.h similarity index 100% rename from tests/e2e/build/test_dep_files_data/dep_files/app/other.h rename to tests/core/build/test_dep_files_data/dep_files/app/other.h diff --git a/tests/e2e/build/test_dep_files_data/dep_files/prelude/prelude.bzl b/tests/core/build/test_dep_files_data/dep_files/prelude/prelude.bzl similarity index 100% rename from tests/e2e/build/test_dep_files_data/dep_files/prelude/prelude.bzl rename to tests/core/build/test_dep_files_data/dep_files/prelude/prelude.bzl diff --git a/tests/e2e/build/test_dep_files_data/dep_files/tools/TARGETS.fixture b/tests/core/build/test_dep_files_data/dep_files/tools/TARGETS.fixture similarity index 100% rename from tests/e2e/build/test_dep_files_data/dep_files/tools/TARGETS.fixture rename to tests/core/build/test_dep_files_data/dep_files/tools/TARGETS.fixture diff --git a/tests/e2e/build/test_dep_files_data/dep_files/tools/gcc.py b/tests/core/build/test_dep_files_data/dep_files/tools/gcc.py similarity index 100% rename from tests/e2e/build/test_dep_files_data/dep_files/tools/gcc.py rename to tests/core/build/test_dep_files_data/dep_files/tools/gcc.py diff --git a/tests/e2e/build/test_dep_files_data/invalid_dep_files/.buckconfig b/tests/core/build/test_dep_files_data/invalid_dep_files/.buckconfig similarity index 100% rename from tests/e2e/build/test_dep_files_data/invalid_dep_files/.buckconfig rename to tests/core/build/test_dep_files_data/invalid_dep_files/.buckconfig diff --git a/tests/e2e/build/test_dep_files_data/invalid_dep_files/TARGETS.fixture b/tests/core/build/test_dep_files_data/invalid_dep_files/TARGETS.fixture similarity index 100% rename from tests/e2e/build/test_dep_files_data/invalid_dep_files/TARGETS.fixture rename to tests/core/build/test_dep_files_data/invalid_dep_files/TARGETS.fixture diff --git a/tests/e2e/build/test_dep_files_data/invalid_dep_files/prelude/prelude.bzl b/tests/core/build/test_dep_files_data/invalid_dep_files/prelude/prelude.bzl similarity index 100% rename from tests/e2e/build/test_dep_files_data/invalid_dep_files/prelude/prelude.bzl rename to tests/core/build/test_dep_files_data/invalid_dep_files/prelude/prelude.bzl diff --git a/tests/e2e/build/test_dep_files_data/mismatched_outputs_dep_files/.buckconfig b/tests/core/build/test_dep_files_data/mismatched_outputs_dep_files/.buckconfig similarity index 100% rename from tests/e2e/build/test_dep_files_data/mismatched_outputs_dep_files/.buckconfig rename to tests/core/build/test_dep_files_data/mismatched_outputs_dep_files/.buckconfig diff --git a/tests/e2e/build/test_dep_files_data/mismatched_outputs_dep_files/TARGETS.fixture b/tests/core/build/test_dep_files_data/mismatched_outputs_dep_files/TARGETS.fixture similarity index 100% rename from tests/e2e/build/test_dep_files_data/mismatched_outputs_dep_files/TARGETS.fixture rename to tests/core/build/test_dep_files_data/mismatched_outputs_dep_files/TARGETS.fixture diff --git a/tests/e2e/build/test_dep_files_data/mismatched_outputs_dep_files/prelude/prelude.bzl b/tests/core/build/test_dep_files_data/mismatched_outputs_dep_files/prelude/prelude.bzl similarity index 100% rename from tests/e2e/build/test_dep_files_data/mismatched_outputs_dep_files/prelude/prelude.bzl rename to tests/core/build/test_dep_files_data/mismatched_outputs_dep_files/prelude/prelude.bzl diff --git a/tests/e2e/build/test_dep_files_data/upload_dep_files/.buckconfig b/tests/core/build/test_dep_files_data/upload_dep_files/.buckconfig similarity index 100% rename from tests/e2e/build/test_dep_files_data/upload_dep_files/.buckconfig rename to tests/core/build/test_dep_files_data/upload_dep_files/.buckconfig diff --git a/tests/e2e/build/test_dep_files_data/upload_dep_files/TARGETS.fixture b/tests/core/build/test_dep_files_data/upload_dep_files/TARGETS.fixture similarity index 100% rename from tests/e2e/build/test_dep_files_data/upload_dep_files/TARGETS.fixture rename to tests/core/build/test_dep_files_data/upload_dep_files/TARGETS.fixture diff --git a/tests/e2e/build/test_dep_files_data/upload_dep_files/create_dep_file.py b/tests/core/build/test_dep_files_data/upload_dep_files/create_dep_file.py similarity index 100% rename from tests/e2e/build/test_dep_files_data/upload_dep_files/create_dep_file.py rename to tests/core/build/test_dep_files_data/upload_dep_files/create_dep_file.py diff --git a/tests/e2e/build/test_dep_files_data/upload_dep_files/platforms/TARGETS.fixture b/tests/core/build/test_dep_files_data/upload_dep_files/platforms/TARGETS.fixture similarity index 100% rename from tests/e2e/build/test_dep_files_data/upload_dep_files/platforms/TARGETS.fixture rename to tests/core/build/test_dep_files_data/upload_dep_files/platforms/TARGETS.fixture diff --git a/tests/e2e/build/test_dep_files_data/upload_dep_files/platforms/rules.bzl b/tests/core/build/test_dep_files_data/upload_dep_files/platforms/rules.bzl similarity index 100% rename from tests/e2e/build/test_dep_files_data/upload_dep_files/platforms/rules.bzl rename to tests/core/build/test_dep_files_data/upload_dep_files/platforms/rules.bzl diff --git a/tests/e2e/build/test_dep_files_data/upload_dep_files/prelude/prelude.bzl b/tests/core/build/test_dep_files_data/upload_dep_files/prelude/prelude.bzl similarity index 100% rename from tests/e2e/build/test_dep_files_data/upload_dep_files/prelude/prelude.bzl rename to tests/core/build/test_dep_files_data/upload_dep_files/prelude/prelude.bzl diff --git a/tests/e2e/build/test_dep_files_data/upload_dep_files/untagged.1 b/tests/core/build/test_dep_files_data/upload_dep_files/untagged.1 similarity index 100% rename from tests/e2e/build/test_dep_files_data/upload_dep_files/untagged.1 rename to tests/core/build/test_dep_files_data/upload_dep_files/untagged.1 diff --git a/tests/e2e/build/test_dep_files_data/upload_dep_files/untagged.2 b/tests/core/build/test_dep_files_data/upload_dep_files/untagged.2 similarity index 100% rename from tests/e2e/build/test_dep_files_data/upload_dep_files/untagged.2 rename to tests/core/build/test_dep_files_data/upload_dep_files/untagged.2 diff --git a/tests/e2e/build/test_dep_files_data/upload_dep_files/unused.1 b/tests/core/build/test_dep_files_data/upload_dep_files/unused.1 similarity index 100% rename from tests/e2e/build/test_dep_files_data/upload_dep_files/unused.1 rename to tests/core/build/test_dep_files_data/upload_dep_files/unused.1 diff --git a/tests/e2e/build/test_dep_files_data/upload_dep_files/unused.2 b/tests/core/build/test_dep_files_data/upload_dep_files/unused.2 similarity index 100% rename from tests/e2e/build/test_dep_files_data/upload_dep_files/unused.2 rename to tests/core/build/test_dep_files_data/upload_dep_files/unused.2 diff --git a/tests/e2e/build/test_dep_files_data/upload_dep_files/used.1 b/tests/core/build/test_dep_files_data/upload_dep_files/used.1 similarity index 100% rename from tests/e2e/build/test_dep_files_data/upload_dep_files/used.1 rename to tests/core/build/test_dep_files_data/upload_dep_files/used.1 diff --git a/tests/e2e/build/test_dep_files_data/upload_dep_files/used.2 b/tests/core/build/test_dep_files_data/upload_dep_files/used.2 similarity index 100% rename from tests/e2e/build/test_dep_files_data/upload_dep_files/used.2 rename to tests/core/build/test_dep_files_data/upload_dep_files/used.2 diff --git a/tests/e2e/build/test_dep_files_data/upload_dep_files/used.3 b/tests/core/build/test_dep_files_data/upload_dep_files/used.3 similarity index 100% rename from tests/e2e/build/test_dep_files_data/upload_dep_files/used.3 rename to tests/core/build/test_dep_files_data/upload_dep_files/used.3 diff --git a/tests/e2e/build/test_executor_with_dependencies.py b/tests/core/build/test_executor_with_dependencies.py similarity index 97% rename from tests/e2e/build/test_executor_with_dependencies.py rename to tests/core/build/test_executor_with_dependencies.py index dcc1f522441b..aab48a658260 100644 --- a/tests/e2e/build/test_executor_with_dependencies.py +++ b/tests/core/build/test_executor_with_dependencies.py @@ -17,7 +17,7 @@ from buck2.tests.e2e_util.helper.utils import random_string, read_what_ran -@buck_test(inplace=False) +@buck_test() async def test_executor_with_dependencies(buck: Buck) -> None: # Smoke test: run on RE and correctly pass the `remote_execution_dependencies` parameter specified in the platform # The RE external dependency (https://fburl.com/wiki/e55nloow) is purposefully wrong as the smc_tier is non existent, @@ -35,7 +35,7 @@ async def test_executor_with_dependencies(buck: Buck) -> None: ) -@buck_test(inplace=False) +@buck_test() async def test_good_target_with_dependencies(buck: Buck) -> None: result = await buck.build( ":good_target_with_dependencies", @@ -64,7 +64,7 @@ async def test_good_target_with_dependencies(buck: Buck) -> None: assert executors == expected -@buck_test(inplace=False) +@buck_test() async def test_bad_target_with_dependencies(buck: Buck) -> None: await expect_failure( buck.build( diff --git a/tests/e2e/build/test_executor_with_dependencies_data/.buckconfig b/tests/core/build/test_executor_with_dependencies_data/.buckconfig similarity index 100% rename from tests/e2e/build/test_executor_with_dependencies_data/.buckconfig rename to tests/core/build/test_executor_with_dependencies_data/.buckconfig diff --git a/tests/e2e/build/test_executor_with_dependencies_data/TARGETS.fixture b/tests/core/build/test_executor_with_dependencies_data/TARGETS.fixture similarity index 100% rename from tests/e2e/build/test_executor_with_dependencies_data/TARGETS.fixture rename to tests/core/build/test_executor_with_dependencies_data/TARGETS.fixture diff --git a/tests/e2e/build/test_executor_with_dependencies_data/defs.bzl b/tests/core/build/test_executor_with_dependencies_data/defs.bzl similarity index 100% rename from tests/e2e/build/test_executor_with_dependencies_data/defs.bzl rename to tests/core/build/test_executor_with_dependencies_data/defs.bzl diff --git a/tests/e2e/build/test_executor_with_dependencies_data/platforms/TARGETS.fixture b/tests/core/build/test_executor_with_dependencies_data/platforms/TARGETS.fixture similarity index 100% rename from tests/e2e/build/test_executor_with_dependencies_data/platforms/TARGETS.fixture rename to tests/core/build/test_executor_with_dependencies_data/platforms/TARGETS.fixture diff --git a/tests/e2e/build/test_executor_with_dependencies_data/platforms/defs.bzl b/tests/core/build/test_executor_with_dependencies_data/platforms/defs.bzl similarity index 100% rename from tests/e2e/build/test_executor_with_dependencies_data/platforms/defs.bzl rename to tests/core/build/test_executor_with_dependencies_data/platforms/defs.bzl diff --git a/tests/e2e/build/test_executor_with_dependencies_data/prelude/prelude.bzl b/tests/core/build/test_executor_with_dependencies_data/prelude/prelude.bzl similarity index 100% rename from tests/e2e/build/test_executor_with_dependencies_data/prelude/prelude.bzl rename to tests/core/build/test_executor_with_dependencies_data/prelude/prelude.bzl diff --git a/tests/e2e/build/test_hash_all_commands.py b/tests/core/build/test_hash_all_commands.py similarity index 97% rename from tests/e2e/build/test_hash_all_commands.py rename to tests/core/build/test_hash_all_commands.py index 850a74165e2d..40650578f0dc 100644 --- a/tests/e2e/build/test_hash_all_commands.py +++ b/tests/core/build/test_hash_all_commands.py @@ -15,7 +15,7 @@ from buck2.tests.e2e_util.helper.utils import expect_exec_count -@buck_test(inplace=False) +@buck_test() @env("BUCK_LOG", "buck2_action_impl::actions::impls::run::dep_files=trace") @pytest.mark.parametrize( "local_only", @@ -50,7 +50,7 @@ async def test_hash_all_commands(buck: Buck, local_only: str) -> None: assert "Command line and directory have not changed" in res.stderr -@buck_test(inplace=False) +@buck_test() async def test_hash_all_commands_key_change(buck: Buck) -> None: # Expecting a rebuild since the command wasn't hashed previously. await buck.build( @@ -87,7 +87,7 @@ async def test_hash_all_commands_key_change(buck: Buck) -> None: await expect_exec_count(buck, 1) -@buck_test(inplace=False) +@buck_test() async def test_hash_all_commands_key_change_deps(buck: Buck) -> None: # Expecting a rebuild since the command wasn't hashed previously. await buck.build( diff --git a/tests/e2e/build/test_hash_all_commands_data/.buckconfig b/tests/core/build/test_hash_all_commands_data/.buckconfig similarity index 100% rename from tests/e2e/build/test_hash_all_commands_data/.buckconfig rename to tests/core/build/test_hash_all_commands_data/.buckconfig diff --git a/tests/e2e/build/test_hash_all_commands_data/TARGETS.fixture b/tests/core/build/test_hash_all_commands_data/TARGETS.fixture similarity index 100% rename from tests/e2e/build/test_hash_all_commands_data/TARGETS.fixture rename to tests/core/build/test_hash_all_commands_data/TARGETS.fixture diff --git a/tests/e2e/build/test_hash_all_commands_data/prelude/prelude.bzl b/tests/core/build/test_hash_all_commands_data/prelude/prelude.bzl similarity index 100% rename from tests/e2e/build/test_hash_all_commands_data/prelude/prelude.bzl rename to tests/core/build/test_hash_all_commands_data/prelude/prelude.bzl diff --git a/tests/e2e/build/test_nested_subtargets.py b/tests/core/build/test_nested_subtargets.py similarity index 96% rename from tests/e2e/build/test_nested_subtargets.py rename to tests/core/build/test_nested_subtargets.py index e45dbd254ed9..3d85e19f9286 100644 --- a/tests/e2e/build/test_nested_subtargets.py +++ b/tests/core/build/test_nested_subtargets.py @@ -14,7 +14,7 @@ from buck2.tests.e2e_util.buck_workspace import buck_test -@buck_test(inplace=False) +@buck_test() async def test_build_nested_subtargets(buck: Buck) -> None: result = await buck.build( "//:nested[sub][nested_sub]", @@ -27,7 +27,7 @@ async def test_build_nested_subtargets(buck: Buck) -> None: asserts.assert_not_executable(output) -@buck_test(inplace=False) +@buck_test() async def test_build_nested_subtargets_errors(buck: Buck) -> None: await expect_failure( buck.build( diff --git a/tests/e2e/build/test_nested_subtargets_data/.buckconfig b/tests/core/build/test_nested_subtargets_data/.buckconfig similarity index 100% rename from tests/e2e/build/test_nested_subtargets_data/.buckconfig rename to tests/core/build/test_nested_subtargets_data/.buckconfig diff --git a/tests/e2e/build/test_nested_subtargets_data/TARGETS.fixture b/tests/core/build/test_nested_subtargets_data/TARGETS.fixture similarity index 100% rename from tests/e2e/build/test_nested_subtargets_data/TARGETS.fixture rename to tests/core/build/test_nested_subtargets_data/TARGETS.fixture diff --git a/tests/e2e/build/test_nested_subtargets_data/defs.bzl b/tests/core/build/test_nested_subtargets_data/defs.bzl similarity index 100% rename from tests/e2e/build/test_nested_subtargets_data/defs.bzl rename to tests/core/build/test_nested_subtargets_data/defs.bzl diff --git a/tests/e2e/build/test_out_flag.py b/tests/core/build/test_out_flag.py similarity index 92% rename from tests/e2e/build/test_out_flag.py rename to tests/core/build/test_out_flag.py index ecc87423e0ae..56d731eaf2c6 100644 --- a/tests/e2e/build/test_out_flag.py +++ b/tests/core/build/test_out_flag.py @@ -17,7 +17,7 @@ from buck2.tests.e2e_util.buck_workspace import buck_test -@buck_test(inplace=False) +@buck_test() async def test_out_single_default_output(buck: Buck) -> None: with tempfile.TemporaryDirectory() as out: output = os.path.join(out, "output") @@ -26,7 +26,7 @@ async def test_out_single_default_output(buck: Buck) -> None: assert readable.read() == "a\n" -@buck_test(inplace=False) +@buck_test() async def test_out_overwrite(buck: Buck) -> None: with tempfile.TemporaryDirectory() as out: output = os.path.join(out, "output") @@ -34,7 +34,7 @@ async def test_out_overwrite(buck: Buck) -> None: await buck.build("//:a", "--out", output) -@buck_test(inplace=False) +@buck_test() async def test_out_parent_not_exist(buck: Buck) -> None: with tempfile.TemporaryDirectory() as out: output = os.path.join(out, "notexist", "output") @@ -43,7 +43,7 @@ async def test_out_parent_not_exist(buck: Buck) -> None: assert readable.read() == "a\n" -@buck_test(inplace=False) +@buck_test() async def test_out_single_default_output_to_dir(buck: Buck) -> None: with tempfile.TemporaryDirectory() as out: await buck.build("//:a", "--out", out) @@ -51,7 +51,7 @@ async def test_out_single_default_output_to_dir(buck: Buck) -> None: assert readable.read() == "a\n" -@buck_test(inplace=False) +@buck_test() async def test_out_no_outputs(buck: Buck) -> None: with tempfile.NamedTemporaryFile("w") as out: await expect_failure( @@ -60,7 +60,7 @@ async def test_out_no_outputs(buck: Buck) -> None: ) -@buck_test(inplace=False) +@buck_test() async def test_out_multiple_outputs(buck: Buck) -> None: with tempfile.NamedTemporaryFile("w") as out: await expect_failure( @@ -69,7 +69,7 @@ async def test_out_multiple_outputs(buck: Buck) -> None: ) -@buck_test(inplace=False) +@buck_test() async def test_out_multiple_targets(buck: Buck) -> None: with tempfile.NamedTemporaryFile("w") as out: await expect_failure( @@ -78,7 +78,7 @@ async def test_out_multiple_targets(buck: Buck) -> None: ) -@buck_test(inplace=False) +@buck_test() async def test_out_directory(buck: Buck) -> None: with tempfile.TemporaryDirectory() as out: await buck.build("//:dir", "--out", out) @@ -86,7 +86,7 @@ async def test_out_directory(buck: Buck) -> None: assert (Path(out) / "nested_dir" / "a.txt").exists() -@buck_test(inplace=False) +@buck_test() async def test_out_stdout_multiple(buck: Buck) -> None: result = await buck.build("//:a", "//:b", "--out", "-") @@ -99,12 +99,12 @@ async def test_out_stdout_multiple(buck: Buck) -> None: assert trailing == "" -@buck_test(inplace=False) +@buck_test() async def test_out_stdout_none(buck: Buck) -> None: await buck.build("--out", "-") -@buck_test(inplace=False) +@buck_test() async def test_out_stdout_directory(buck: Buck) -> None: await expect_failure( buck.build("//:dir", "--out", "-"), diff --git a/tests/e2e/build/test_out_flag_data/.buckconfig b/tests/core/build/test_out_flag_data/.buckconfig similarity index 100% rename from tests/e2e/build/test_out_flag_data/.buckconfig rename to tests/core/build/test_out_flag_data/.buckconfig diff --git a/tests/e2e/build/test_out_flag_data/TARGETS.fixture b/tests/core/build/test_out_flag_data/TARGETS.fixture similarity index 100% rename from tests/e2e/build/test_out_flag_data/TARGETS.fixture rename to tests/core/build/test_out_flag_data/TARGETS.fixture diff --git a/tests/e2e/build/test_out_flag_data/a.txt b/tests/core/build/test_out_flag_data/a.txt similarity index 100% rename from tests/e2e/build/test_out_flag_data/a.txt rename to tests/core/build/test_out_flag_data/a.txt diff --git a/tests/e2e/build/test_out_flag_data/b.txt b/tests/core/build/test_out_flag_data/b.txt similarity index 100% rename from tests/e2e/build/test_out_flag_data/b.txt rename to tests/core/build/test_out_flag_data/b.txt diff --git a/tests/e2e/build/test_out_flag_data/defs.bzl b/tests/core/build/test_out_flag_data/defs.bzl similarity index 100% rename from tests/e2e/build/test_out_flag_data/defs.bzl rename to tests/core/build/test_out_flag_data/defs.bzl diff --git a/tests/e2e/build/test_out_flag_data/directory/b.txt b/tests/core/build/test_out_flag_data/directory/b.txt similarity index 100% rename from tests/e2e/build/test_out_flag_data/directory/b.txt rename to tests/core/build/test_out_flag_data/directory/b.txt diff --git a/tests/e2e/build/test_out_flag_data/directory/nested_dir/a.txt b/tests/core/build/test_out_flag_data/directory/nested_dir/a.txt similarity index 100% rename from tests/e2e/build/test_out_flag_data/directory/nested_dir/a.txt rename to tests/core/build/test_out_flag_data/directory/nested_dir/a.txt diff --git a/tests/e2e/build/test_plugins.py b/tests/core/build/test_plugins.py similarity index 96% rename from tests/e2e/build/test_plugins.py rename to tests/core/build/test_plugins.py index 271617f03640..91d4b2475e98 100644 --- a/tests/e2e/build/test_plugins.py +++ b/tests/core/build/test_plugins.py @@ -15,7 +15,7 @@ from buck2.tests.e2e_util.buck_workspace import buck_test -@buck_test(inplace=False) +@buck_test() async def test_deps_in_cquery_not_uquery(buck: Buck) -> None: # Check that plugin deps appear as deps in uquery but not in cquery result = await buck.uquery("deps(//tests:reg_a)") @@ -33,7 +33,7 @@ async def test_deps_in_cquery_not_uquery(buck: Buck) -> None: } -@buck_test(inplace=False) +@buck_test() async def test_cquery(buck: Buck) -> None: ###### Check that everything is correctly configured as reported by cquery result = await buck.cquery( @@ -84,7 +84,7 @@ async def test_cquery(buck: Buck) -> None: ) -@buck_test(inplace=False) +@buck_test() async def test_analysis(buck: Buck) -> None: # Check that we can properly identify all the different plugin deps in analysis result = await buck.build("root//tests:b", "root//tests:l") @@ -110,7 +110,7 @@ async def test_analysis(buck: Buck) -> None: } -@buck_test(inplace=False) +@buck_test() async def test_plugin_dep_errors(buck: Buck) -> None: # Tests are explained in the file await buck.build("//test_errors:recursive_target_1") @@ -128,7 +128,7 @@ async def test_plugin_dep_errors(buck: Buck) -> None: assert "The rule did not declare that it uses plugins of kind A" in result.stderr -@buck_test(inplace=False) +@buck_test() async def test_repeated_insertion(buck: Buck) -> None: result = await buck.cquery( "-a", "buck.plugins", "//repeated_insertion:different_deps_alias" @@ -138,7 +138,7 @@ async def test_repeated_insertion(buck: Buck) -> None: )[0]["buck.plugins"] -@buck_test(inplace=False) +@buck_test() async def test_visibility(buck: Buck) -> None: result = await expect_failure(buck.build("//visibility:missing_access")) assert ( diff --git a/tests/e2e/build/test_plugins_data/.buckconfig b/tests/core/build/test_plugins_data/.buckconfig similarity index 100% rename from tests/e2e/build/test_plugins_data/.buckconfig rename to tests/core/build/test_plugins_data/.buckconfig diff --git a/tests/e2e/build/test_plugins_data/.buckroot b/tests/core/build/test_plugins_data/.buckroot similarity index 100% rename from tests/e2e/build/test_plugins_data/.buckroot rename to tests/core/build/test_plugins_data/.buckroot diff --git a/tests/e2e/build/test_plugins_data/config/TARGETS.fixture b/tests/core/build/test_plugins_data/config/TARGETS.fixture similarity index 100% rename from tests/e2e/build/test_plugins_data/config/TARGETS.fixture rename to tests/core/build/test_plugins_data/config/TARGETS.fixture diff --git a/tests/e2e/build/test_plugins_data/config/defs.bzl b/tests/core/build/test_plugins_data/config/defs.bzl similarity index 100% rename from tests/e2e/build/test_plugins_data/config/defs.bzl rename to tests/core/build/test_plugins_data/config/defs.bzl diff --git a/tests/e2e/build/test_plugins_data/prelude/prelude.bzl b/tests/core/build/test_plugins_data/prelude/prelude.bzl similarity index 100% rename from tests/e2e/build/test_plugins_data/prelude/prelude.bzl rename to tests/core/build/test_plugins_data/prelude/prelude.bzl diff --git a/tests/e2e/build/test_plugins_data/repeated_insertion/TARGETS.fixture b/tests/core/build/test_plugins_data/repeated_insertion/TARGETS.fixture similarity index 100% rename from tests/e2e/build/test_plugins_data/repeated_insertion/TARGETS.fixture rename to tests/core/build/test_plugins_data/repeated_insertion/TARGETS.fixture diff --git a/tests/e2e/build/test_plugins_data/repeated_insertion/rules.bzl b/tests/core/build/test_plugins_data/repeated_insertion/rules.bzl similarity index 100% rename from tests/e2e/build/test_plugins_data/repeated_insertion/rules.bzl rename to tests/core/build/test_plugins_data/repeated_insertion/rules.bzl diff --git a/tests/e2e/build/test_plugins_data/test_errors/TARGETS.fixture b/tests/core/build/test_plugins_data/test_errors/TARGETS.fixture similarity index 100% rename from tests/e2e/build/test_plugins_data/test_errors/TARGETS.fixture rename to tests/core/build/test_plugins_data/test_errors/TARGETS.fixture diff --git a/tests/e2e/build/test_plugins_data/test_errors/rules.bzl b/tests/core/build/test_plugins_data/test_errors/rules.bzl similarity index 100% rename from tests/e2e/build/test_plugins_data/test_errors/rules.bzl rename to tests/core/build/test_plugins_data/test_errors/rules.bzl diff --git a/tests/e2e/build/test_plugins_data/tests/TARGETS.fixture b/tests/core/build/test_plugins_data/tests/TARGETS.fixture similarity index 100% rename from tests/e2e/build/test_plugins_data/tests/TARGETS.fixture rename to tests/core/build/test_plugins_data/tests/TARGETS.fixture diff --git a/tests/e2e/build/test_plugins_data/tests/rules.bzl b/tests/core/build/test_plugins_data/tests/rules.bzl similarity index 100% rename from tests/e2e/build/test_plugins_data/tests/rules.bzl rename to tests/core/build/test_plugins_data/tests/rules.bzl diff --git a/tests/e2e/build/test_plugins_data/visibility/TARGETS.fixture b/tests/core/build/test_plugins_data/visibility/TARGETS.fixture similarity index 100% rename from tests/e2e/build/test_plugins_data/visibility/TARGETS.fixture rename to tests/core/build/test_plugins_data/visibility/TARGETS.fixture diff --git a/tests/e2e/build/test_plugins_data/visibility/package/TARGETS.fixture b/tests/core/build/test_plugins_data/visibility/package/TARGETS.fixture similarity index 100% rename from tests/e2e/build/test_plugins_data/visibility/package/TARGETS.fixture rename to tests/core/build/test_plugins_data/visibility/package/TARGETS.fixture diff --git a/tests/e2e/build/test_plugins_data/visibility/rules.bzl b/tests/core/build/test_plugins_data/visibility/rules.bzl similarity index 100% rename from tests/e2e/build/test_plugins_data/visibility/rules.bzl rename to tests/core/build/test_plugins_data/visibility/rules.bzl diff --git a/tests/e2e/build/test_remote_execution.py b/tests/core/build/test_remote_execution.py similarity index 97% rename from tests/e2e/build/test_remote_execution.py rename to tests/core/build/test_remote_execution.py index a2549299b1af..dc77963a7c2c 100644 --- a/tests/e2e/build/test_remote_execution.py +++ b/tests/core/build/test_remote_execution.py @@ -12,7 +12,7 @@ from buck2.tests.e2e_util.buck_workspace import buck_test, env -@buck_test(inplace=False) +@buck_test() @env("BUCK2_TEST_FAIL_CONNECT", "true") async def test_re_connection_failure_no_retry(buck: Buck) -> None: out = await expect_failure( diff --git a/tests/e2e/build/test_remote_execution_data/.buckconfig b/tests/core/build/test_remote_execution_data/.buckconfig similarity index 100% rename from tests/e2e/build/test_remote_execution_data/.buckconfig rename to tests/core/build/test_remote_execution_data/.buckconfig diff --git a/tests/e2e/build/test_remote_execution_data/TARGETS.fixture b/tests/core/build/test_remote_execution_data/TARGETS.fixture similarity index 100% rename from tests/e2e/build/test_remote_execution_data/TARGETS.fixture rename to tests/core/build/test_remote_execution_data/TARGETS.fixture diff --git a/tests/e2e/build/test_remote_execution_data/defs.bzl b/tests/core/build/test_remote_execution_data/defs.bzl similarity index 100% rename from tests/e2e/build/test_remote_execution_data/defs.bzl rename to tests/core/build/test_remote_execution_data/defs.bzl diff --git a/tests/e2e/build/test_symlinks.py b/tests/core/build/test_symlinks.py similarity index 98% rename from tests/e2e/build/test_symlinks.py rename to tests/core/build/test_symlinks.py index 7c19e75d39a3..94df096175e7 100644 --- a/tests/e2e/build/test_symlinks.py +++ b/tests/core/build/test_symlinks.py @@ -18,7 +18,7 @@ from buck2.tests.e2e_util.helper.utils import expect_exec_count -@buck_test(inplace=False) +@buck_test() async def test_symlinks(buck: Buck) -> None: # We want to check in a symlink but given Buck is running this and symlinks # do not exist we need to put it back and make it be an actual symlink. @@ -49,7 +49,6 @@ async def test_symlinks(buck: Buck) -> None: @buck_test( - inplace=False, # For some reason, this test fails when using filesystem watcher on macos, so explicitly set extra_buck_config={"buck2": {"file_watcher": "watchman"}}, ) @@ -80,7 +79,6 @@ async def test_symlinks_redirection(buck: Buck) -> None: @buck_test( - inplace=False, # For some reason, this test fails when using filesystem watcher on macos, so explicitly set extra_buck_config={"buck2": {"file_watcher": "watchman"}}, ) diff --git a/tests/e2e/build/test_symlinks_data/.buckconfig b/tests/core/build/test_symlinks_data/.buckconfig similarity index 100% rename from tests/e2e/build/test_symlinks_data/.buckconfig rename to tests/core/build/test_symlinks_data/.buckconfig diff --git a/tests/e2e/build/test_symlinks_data/TARGETS.fixture b/tests/core/build/test_symlinks_data/TARGETS.fixture similarity index 100% rename from tests/e2e/build/test_symlinks_data/TARGETS.fixture rename to tests/core/build/test_symlinks_data/TARGETS.fixture diff --git a/tests/e2e/build/test_symlinks_data/defs.bzl b/tests/core/build/test_symlinks_data/defs.bzl similarity index 100% rename from tests/e2e/build/test_symlinks_data/defs.bzl rename to tests/core/build/test_symlinks_data/defs.bzl diff --git a/tests/e2e/build/test_symlinks_data/dir/file b/tests/core/build/test_symlinks_data/dir/file similarity index 100% rename from tests/e2e/build/test_symlinks_data/dir/file rename to tests/core/build/test_symlinks_data/dir/file diff --git a/tests/e2e/build/test_symlinks_data/dir2/file b/tests/core/build/test_symlinks_data/dir2/file similarity index 100% rename from tests/e2e/build/test_symlinks_data/dir2/file rename to tests/core/build/test_symlinks_data/dir2/file diff --git a/tests/e2e/build/test_symlinks_data/ext/link/file b/tests/core/build/test_symlinks_data/ext/link/file similarity index 100% rename from tests/e2e/build/test_symlinks_data/ext/link/file rename to tests/core/build/test_symlinks_data/ext/link/file diff --git a/tests/e2e/build/test_symlinks_data/prelude/prelude.bzl b/tests/core/build/test_symlinks_data/prelude/prelude.bzl similarity index 100% rename from tests/e2e/build/test_symlinks_data/prelude/prelude.bzl rename to tests/core/build/test_symlinks_data/prelude/prelude.bzl diff --git a/tests/e2e/build/test_symlinks_data/src/link b/tests/core/build/test_symlinks_data/src/link similarity index 100% rename from tests/e2e/build/test_symlinks_data/src/link rename to tests/core/build/test_symlinks_data/src/link diff --git a/tests/e2e/build/test_target_aliases.py b/tests/core/build/test_target_aliases.py similarity index 97% rename from tests/e2e/build/test_target_aliases.py rename to tests/core/build/test_target_aliases.py index 7b448db76594..cab3203c934f 100644 --- a/tests/e2e/build/test_target_aliases.py +++ b/tests/core/build/test_target_aliases.py @@ -15,7 +15,7 @@ from buck2.tests.e2e_util.buck_workspace import buck_test -@buck_test(inplace=False) +@buck_test() async def test_target_aliases(buck: Buck) -> None: await buck.targets("alias") await buck.cquery("deps(alias)") @@ -58,7 +58,7 @@ async def test_target_aliases(buck: Buck) -> None: ) -@buck_test(inplace=False) +@buck_test() async def test_resolve_alias_json(buck: Buck) -> None: res = await buck.targets( "--resolve-alias", "alias", "chain", "//targets:target", "--json" @@ -83,7 +83,7 @@ async def test_resolve_alias_json(buck: Buck) -> None: ] -@buck_test(inplace=False) +@buck_test() async def test_resolve_alias_json_lines(buck: Buck) -> None: res = await buck.targets( "--resolve-alias", "alias", "chain", "//targets:target", "--json-lines" diff --git a/tests/e2e/build/test_target_aliases_data/.buckconfig b/tests/core/build/test_target_aliases_data/.buckconfig similarity index 100% rename from tests/e2e/build/test_target_aliases_data/.buckconfig rename to tests/core/build/test_target_aliases_data/.buckconfig diff --git a/tests/e2e/build/test_target_aliases_data/broken/TARGETS.fixture b/tests/core/build/test_target_aliases_data/broken/TARGETS.fixture similarity index 100% rename from tests/e2e/build/test_target_aliases_data/broken/TARGETS.fixture rename to tests/core/build/test_target_aliases_data/broken/TARGETS.fixture diff --git a/tests/e2e/build/test_target_aliases_data/prelude/prelude.bzl b/tests/core/build/test_target_aliases_data/prelude/prelude.bzl similarity index 100% rename from tests/e2e/build/test_target_aliases_data/prelude/prelude.bzl rename to tests/core/build/test_target_aliases_data/prelude/prelude.bzl diff --git a/tests/e2e/build/test_target_aliases_data/targets/TARGETS.fixture b/tests/core/build/test_target_aliases_data/targets/TARGETS.fixture similarity index 100% rename from tests/e2e/build/test_target_aliases_data/targets/TARGETS.fixture rename to tests/core/build/test_target_aliases_data/targets/TARGETS.fixture diff --git a/tests/e2e/build/test_uncategorized.py b/tests/core/build/test_uncategorized.py similarity index 94% rename from tests/e2e/build/test_uncategorized.py rename to tests/core/build/test_uncategorized.py index a1b587470d61..db1570e4281d 100644 --- a/tests/e2e/build/test_uncategorized.py +++ b/tests/core/build/test_uncategorized.py @@ -27,7 +27,7 @@ from buck2.tests.e2e_util.helper.utils import json_get, read_what_ran -@buck_test(inplace=False, data_dir="anon_exec_deps") +@buck_test(data_dir="anon_exec_deps") async def test_anon_target_exec_deps(buck: Buck) -> None: await buck.build("//tests:exec_dep_good", "--remote-only") @@ -42,7 +42,7 @@ async def test_anon_target_exec_deps(buck: Buck) -> None: ) -@buck_test(inplace=False, data_dir="args") +@buck_test(data_dir="args") async def test_args(buck: Buck) -> None: result = await buck.build("//:bin") output = result.get_build_report().output_for_target("//:bin") @@ -52,7 +52,7 @@ async def test_args(buck: Buck) -> None: ) -@buck_test(inplace=False, data_dir="prelude_import") +@buck_test(data_dir="prelude_import") async def test_prelude_imported_once(buck: Buck) -> None: # See the comments in the relevant targets files: they explain how this # test works. @@ -71,7 +71,7 @@ def read_all_outputs(buck: Buck, report: str) -> typing.List[str]: return ret -@buck_test(inplace=False, data_dir="build_providers") +@buck_test(data_dir="build_providers") async def test_build_providers(buck: Buck) -> None: await buck.build( "//:target", @@ -122,7 +122,7 @@ async def test_build_providers(buck: Buck) -> None: assert any("/test" in o for o in outputs) -@buck_test(inplace=False, data_dir="projected_artifacts") +@buck_test(data_dir="projected_artifacts") @pytest.mark.parametrize( "target", [ @@ -137,7 +137,7 @@ async def test_projected_artifacts(buck: Buck, target: str) -> None: await buck.build(target) -@buck_test(inplace=False, data_dir="upload_all_actions") +@buck_test(data_dir="upload_all_actions") async def test_upload_all_actions(buck: Buck) -> None: with open(buck.cwd / "src", "w") as src: src.write(random_string()) @@ -159,13 +159,13 @@ async def test_upload_all_actions(buck: Buck) -> None: ) -@buck_test(inplace=False, data_dir="buckroot") +@buck_test(data_dir="buckroot") async def test_buckroot(buck: Buck) -> None: # Test that .buckroot files work await buck.build(":inner", rel_cwd=Path("rooted/cell")) -@buck_test(inplace=False, data_dir="cell_delete") +@buck_test(data_dir="cell_delete") async def test_cell_deletion(buck: Buck) -> None: """ This is a regression test for https://github.com/facebook/buck2/pull/43, @@ -179,7 +179,6 @@ async def test_cell_deletion(buck: Buck) -> None: @buck_test( - inplace=False, data_dir="invalid_file_invalidation", skip_for_os=["windows"], # For some reason, this test fails when using filesystem watcher on macos, so explicitly set @@ -228,7 +227,7 @@ async def test_invalid_file_invalidation(buck: Buck) -> None: await buck.build(":root") -@buck_test(inplace=False, data_dir="concurrency") +@buck_test(data_dir="concurrency") async def test_concurrency(buck: Buck) -> None: await buck.build("//:weight", "--local-only", "--no-remote-cache") @@ -279,7 +278,7 @@ async def test_concurrency(buck: Buck) -> None: assert execs_done == 10 -@buck_test(inplace=False, data_dir="fail_fast") +@buck_test(data_dir="fail_fast") async def test_fail_fast(buck: Buck) -> None: with pytest.raises(BuckException) as exc: await buck.build( @@ -307,7 +306,7 @@ async def test_fail_fast(buck: Buck) -> None: assert "slow_other_output" not in exc.value.stderr -@buck_test(inplace=False, data_dir="keep_going_build") +@buck_test(data_dir="keep_going_build") async def test_keep_going(buck: Buck) -> None: with pytest.raises(BuckException) as exc: await buck.build( @@ -332,7 +331,7 @@ async def test_keep_going(buck: Buck) -> None: assert "slow_action" in exc.value.stderr -@buck_test(inplace=False, data_dir="cleanup") +@buck_test(data_dir="cleanup") async def test_cleanup(buck: Buck) -> None: # Test for T85589819 - broken cleanup target_pattern = "//:cleanup" @@ -354,7 +353,7 @@ async def test_cleanup(buck: Buck) -> None: await buck.build(target_pattern) -@buck_test(inplace=False, data_dir="log_action_keys") +@buck_test(data_dir="log_action_keys") async def test_log_action_keys(buck: Buck) -> None: async def read_action_keys() -> List[Tuple[str, str]]: out = await read_what_ran(buck) @@ -385,7 +384,7 @@ async def read_action_keys() -> List[Tuple[str, str]]: assert await read_action_keys() == [("Cache", action_key)] -@buck_test(inplace=False, data_dir="roots") +@buck_test(data_dir="roots") async def test_roots(buck: Buck) -> None: res = await buck.build("root//:test", "other//:test") @@ -418,12 +417,12 @@ def platformify(path: str) -> str: assert j["project_relative_to_fixture"] == platformify("../../../../../../..") -@buck_test(inplace=False, data_dir="tmpdir") +@buck_test(data_dir="tmpdir") async def test_tmpdir(buck: Buck) -> None: await buck.build("root//:") -@buck_test(inplace=False, data_dir="materialize_inputs_for_failed_actions") +@buck_test(data_dir="materialize_inputs_for_failed_actions") async def test_materialize_inputs_for_failed_actions(buck: Buck) -> None: await expect_failure( buck.build( @@ -480,7 +479,7 @@ def random_string() -> str: return "".join(random.choice(string.ascii_lowercase) for i in range(256)) -@buck_test(inplace=False, data_dir="artifact_consistency") +@buck_test(data_dir="artifact_consistency") async def test_artifact_consistency(buck: Buck) -> None: out = await buck.build_without_report( ":gen[file3]", diff --git a/tests/e2e/build/test_uncategorized_data/action_digest/.buckconfig b/tests/core/build/test_uncategorized_data/action_digest/.buckconfig similarity index 100% rename from tests/e2e/build/test_uncategorized_data/action_digest/.buckconfig rename to tests/core/build/test_uncategorized_data/action_digest/.buckconfig diff --git a/tests/e2e/build/test_uncategorized_data/action_digest/.buckroot b/tests/core/build/test_uncategorized_data/action_digest/.buckroot similarity index 100% rename from tests/e2e/build/test_uncategorized_data/action_digest/.buckroot rename to tests/core/build/test_uncategorized_data/action_digest/.buckroot diff --git a/tests/e2e/build/test_uncategorized_data/action_digest/TARGETS.fixture b/tests/core/build/test_uncategorized_data/action_digest/TARGETS.fixture similarity index 100% rename from tests/e2e/build/test_uncategorized_data/action_digest/TARGETS.fixture rename to tests/core/build/test_uncategorized_data/action_digest/TARGETS.fixture diff --git a/tests/e2e/build/test_uncategorized_data/action_digest/defs.bzl b/tests/core/build/test_uncategorized_data/action_digest/defs.bzl similarity index 100% rename from tests/e2e/build/test_uncategorized_data/action_digest/defs.bzl rename to tests/core/build/test_uncategorized_data/action_digest/defs.bzl diff --git a/tests/e2e/build/test_uncategorized_data/action_digest/prelude.bzl b/tests/core/build/test_uncategorized_data/action_digest/prelude.bzl similarity index 100% rename from tests/e2e/build/test_uncategorized_data/action_digest/prelude.bzl rename to tests/core/build/test_uncategorized_data/action_digest/prelude.bzl diff --git a/tests/e2e/build/test_uncategorized_data/action_digest/test.py b/tests/core/build/test_uncategorized_data/action_digest/test.py similarity index 100% rename from tests/e2e/build/test_uncategorized_data/action_digest/test.py rename to tests/core/build/test_uncategorized_data/action_digest/test.py diff --git a/tests/e2e/build/test_uncategorized_data/anon_exec_deps/.buckconfig b/tests/core/build/test_uncategorized_data/anon_exec_deps/.buckconfig similarity index 100% rename from tests/e2e/build/test_uncategorized_data/anon_exec_deps/.buckconfig rename to tests/core/build/test_uncategorized_data/anon_exec_deps/.buckconfig diff --git a/tests/e2e/build/test_uncategorized_data/anon_exec_deps/platforms/TARGETS.fixture b/tests/core/build/test_uncategorized_data/anon_exec_deps/platforms/TARGETS.fixture similarity index 100% rename from tests/e2e/build/test_uncategorized_data/anon_exec_deps/platforms/TARGETS.fixture rename to tests/core/build/test_uncategorized_data/anon_exec_deps/platforms/TARGETS.fixture diff --git a/tests/e2e/build/test_uncategorized_data/anon_exec_deps/prelude/prelude.bzl b/tests/core/build/test_uncategorized_data/anon_exec_deps/prelude/prelude.bzl similarity index 100% rename from tests/e2e/build/test_uncategorized_data/anon_exec_deps/prelude/prelude.bzl rename to tests/core/build/test_uncategorized_data/anon_exec_deps/prelude/prelude.bzl diff --git a/tests/e2e/build/test_uncategorized_data/anon_exec_deps/rules/exec_deps.bzl b/tests/core/build/test_uncategorized_data/anon_exec_deps/rules/exec_deps.bzl similarity index 100% rename from tests/e2e/build/test_uncategorized_data/anon_exec_deps/rules/exec_deps.bzl rename to tests/core/build/test_uncategorized_data/anon_exec_deps/rules/exec_deps.bzl diff --git a/tests/e2e/build/test_uncategorized_data/anon_exec_deps/rules/rules.bzl b/tests/core/build/test_uncategorized_data/anon_exec_deps/rules/rules.bzl similarity index 100% rename from tests/e2e/build/test_uncategorized_data/anon_exec_deps/rules/rules.bzl rename to tests/core/build/test_uncategorized_data/anon_exec_deps/rules/rules.bzl diff --git a/tests/e2e/build/test_uncategorized_data/anon_exec_deps/tests/TARGETS.fixture b/tests/core/build/test_uncategorized_data/anon_exec_deps/tests/TARGETS.fixture similarity index 100% rename from tests/e2e/build/test_uncategorized_data/anon_exec_deps/tests/TARGETS.fixture rename to tests/core/build/test_uncategorized_data/anon_exec_deps/tests/TARGETS.fixture diff --git a/tests/e2e/build/test_uncategorized_data/anon_exec_deps/tests/local_only.py b/tests/core/build/test_uncategorized_data/anon_exec_deps/tests/local_only.py similarity index 100% rename from tests/e2e/build/test_uncategorized_data/anon_exec_deps/tests/local_only.py rename to tests/core/build/test_uncategorized_data/anon_exec_deps/tests/local_only.py diff --git a/tests/e2e/build/test_uncategorized_data/anon_exec_deps/tests/remote_only.py b/tests/core/build/test_uncategorized_data/anon_exec_deps/tests/remote_only.py similarity index 100% rename from tests/e2e/build/test_uncategorized_data/anon_exec_deps/tests/remote_only.py rename to tests/core/build/test_uncategorized_data/anon_exec_deps/tests/remote_only.py diff --git a/tests/e2e/build/test_uncategorized_data/args/.buckconfig b/tests/core/build/test_uncategorized_data/args/.buckconfig similarity index 100% rename from tests/e2e/build/test_uncategorized_data/args/.buckconfig rename to tests/core/build/test_uncategorized_data/args/.buckconfig diff --git a/tests/e2e/build/test_uncategorized_data/args/TARGETS.fixture b/tests/core/build/test_uncategorized_data/args/TARGETS.fixture similarity index 100% rename from tests/e2e/build/test_uncategorized_data/args/TARGETS.fixture rename to tests/core/build/test_uncategorized_data/args/TARGETS.fixture diff --git a/tests/e2e/build/test_uncategorized_data/args/defs.bzl b/tests/core/build/test_uncategorized_data/args/defs.bzl similarity index 100% rename from tests/e2e/build/test_uncategorized_data/args/defs.bzl rename to tests/core/build/test_uncategorized_data/args/defs.bzl diff --git a/tests/e2e/build/test_uncategorized_data/args/prelude/prelude.bzl b/tests/core/build/test_uncategorized_data/args/prelude/prelude.bzl similarity index 100% rename from tests/e2e/build/test_uncategorized_data/args/prelude/prelude.bzl rename to tests/core/build/test_uncategorized_data/args/prelude/prelude.bzl diff --git a/tests/e2e/build/test_uncategorized_data/artifact_consistency/.buckconfig b/tests/core/build/test_uncategorized_data/artifact_consistency/.buckconfig similarity index 100% rename from tests/e2e/build/test_uncategorized_data/artifact_consistency/.buckconfig rename to tests/core/build/test_uncategorized_data/artifact_consistency/.buckconfig diff --git a/tests/e2e/build/test_uncategorized_data/artifact_consistency/.buckroot b/tests/core/build/test_uncategorized_data/artifact_consistency/.buckroot similarity index 100% rename from tests/e2e/build/test_uncategorized_data/artifact_consistency/.buckroot rename to tests/core/build/test_uncategorized_data/artifact_consistency/.buckroot diff --git a/tests/e2e/build/test_uncategorized_data/artifact_consistency/TARGETS.fixture b/tests/core/build/test_uncategorized_data/artifact_consistency/TARGETS.fixture similarity index 100% rename from tests/e2e/build/test_uncategorized_data/artifact_consistency/TARGETS.fixture rename to tests/core/build/test_uncategorized_data/artifact_consistency/TARGETS.fixture diff --git a/tests/e2e/build/test_uncategorized_data/artifact_consistency/gen.py b/tests/core/build/test_uncategorized_data/artifact_consistency/gen.py similarity index 100% rename from tests/e2e/build/test_uncategorized_data/artifact_consistency/gen.py rename to tests/core/build/test_uncategorized_data/artifact_consistency/gen.py diff --git a/tests/e2e/build/test_uncategorized_data/artifact_consistency/prelude/prelude.bzl b/tests/core/build/test_uncategorized_data/artifact_consistency/prelude/prelude.bzl similarity index 100% rename from tests/e2e/build/test_uncategorized_data/artifact_consistency/prelude/prelude.bzl rename to tests/core/build/test_uncategorized_data/artifact_consistency/prelude/prelude.bzl diff --git a/tests/e2e/build/test_uncategorized_data/buckroot/.buckconfig b/tests/core/build/test_uncategorized_data/buckroot/.buckconfig similarity index 100% rename from tests/e2e/build/test_uncategorized_data/buckroot/.buckconfig rename to tests/core/build/test_uncategorized_data/buckroot/.buckconfig diff --git a/tests/e2e/build/test_uncategorized_data/buckroot/rooted/.buckconfig b/tests/core/build/test_uncategorized_data/buckroot/rooted/.buckconfig similarity index 100% rename from tests/e2e/build/test_uncategorized_data/buckroot/rooted/.buckconfig rename to tests/core/build/test_uncategorized_data/buckroot/rooted/.buckconfig diff --git a/tests/e2e/build/test_uncategorized_data/buckroot/rooted/.buckroot b/tests/core/build/test_uncategorized_data/buckroot/rooted/.buckroot similarity index 100% rename from tests/e2e/build/test_uncategorized_data/buckroot/rooted/.buckroot rename to tests/core/build/test_uncategorized_data/buckroot/rooted/.buckroot diff --git a/tests/e2e/build/test_uncategorized_data/buckroot/rooted/OUTER b/tests/core/build/test_uncategorized_data/buckroot/rooted/OUTER similarity index 100% rename from tests/e2e/build/test_uncategorized_data/buckroot/rooted/OUTER rename to tests/core/build/test_uncategorized_data/buckroot/rooted/OUTER diff --git a/tests/e2e/build/test_uncategorized_data/buckroot/rooted/cell/.buckconfig b/tests/core/build/test_uncategorized_data/buckroot/rooted/cell/.buckconfig similarity index 100% rename from tests/e2e/build/test_uncategorized_data/buckroot/rooted/cell/.buckconfig rename to tests/core/build/test_uncategorized_data/buckroot/rooted/cell/.buckconfig diff --git a/tests/e2e/build/test_uncategorized_data/buckroot/rooted/cell/INNER b/tests/core/build/test_uncategorized_data/buckroot/rooted/cell/INNER similarity index 100% rename from tests/e2e/build/test_uncategorized_data/buckroot/rooted/cell/INNER rename to tests/core/build/test_uncategorized_data/buckroot/rooted/cell/INNER diff --git a/tests/e2e/build/test_uncategorized_data/buckroot/rooted/cell/prelude.bzl b/tests/core/build/test_uncategorized_data/buckroot/rooted/cell/prelude.bzl similarity index 100% rename from tests/e2e/build/test_uncategorized_data/buckroot/rooted/cell/prelude.bzl rename to tests/core/build/test_uncategorized_data/buckroot/rooted/cell/prelude.bzl diff --git a/tests/e2e/build/test_uncategorized_data/build_providers/.buckconfig b/tests/core/build/test_uncategorized_data/build_providers/.buckconfig similarity index 100% rename from tests/e2e/build/test_uncategorized_data/build_providers/.buckconfig rename to tests/core/build/test_uncategorized_data/build_providers/.buckconfig diff --git a/tests/e2e/build/test_uncategorized_data/build_providers/TARGETS.fixture b/tests/core/build/test_uncategorized_data/build_providers/TARGETS.fixture similarity index 100% rename from tests/e2e/build/test_uncategorized_data/build_providers/TARGETS.fixture rename to tests/core/build/test_uncategorized_data/build_providers/TARGETS.fixture diff --git a/tests/e2e/build/test_uncategorized_data/build_providers/build b/tests/core/build/test_uncategorized_data/build_providers/build similarity index 100% rename from tests/e2e/build/test_uncategorized_data/build_providers/build rename to tests/core/build/test_uncategorized_data/build_providers/build diff --git a/tests/e2e/build/test_uncategorized_data/build_providers/prelude/prelude.bzl b/tests/core/build/test_uncategorized_data/build_providers/prelude/prelude.bzl similarity index 100% rename from tests/e2e/build/test_uncategorized_data/build_providers/prelude/prelude.bzl rename to tests/core/build/test_uncategorized_data/build_providers/prelude/prelude.bzl diff --git a/tests/e2e/build/test_uncategorized_data/build_providers/run b/tests/core/build/test_uncategorized_data/build_providers/run similarity index 100% rename from tests/e2e/build/test_uncategorized_data/build_providers/run rename to tests/core/build/test_uncategorized_data/build_providers/run diff --git a/tests/e2e/build/test_uncategorized_data/build_providers/test b/tests/core/build/test_uncategorized_data/build_providers/test similarity index 100% rename from tests/e2e/build/test_uncategorized_data/build_providers/test rename to tests/core/build/test_uncategorized_data/build_providers/test diff --git a/tests/e2e/build/test_uncategorized_data/cell_delete/.buckconfig b/tests/core/build/test_uncategorized_data/cell_delete/.buckconfig similarity index 100% rename from tests/e2e/build/test_uncategorized_data/cell_delete/.buckconfig rename to tests/core/build/test_uncategorized_data/cell_delete/.buckconfig diff --git a/tests/e2e/build/test_uncategorized_data/cell_delete/TARGETS.fixture b/tests/core/build/test_uncategorized_data/cell_delete/TARGETS.fixture similarity index 100% rename from tests/e2e/build/test_uncategorized_data/cell_delete/TARGETS.fixture rename to tests/core/build/test_uncategorized_data/cell_delete/TARGETS.fixture diff --git a/tests/e2e/build/test_uncategorized_data/cell_delete/prelude/prelude.bzl b/tests/core/build/test_uncategorized_data/cell_delete/prelude/prelude.bzl similarity index 100% rename from tests/e2e/build/test_uncategorized_data/cell_delete/prelude/prelude.bzl rename to tests/core/build/test_uncategorized_data/cell_delete/prelude/prelude.bzl diff --git a/tests/e2e/build/test_uncategorized_data/cleanup/.buckconfig b/tests/core/build/test_uncategorized_data/cleanup/.buckconfig similarity index 100% rename from tests/e2e/build/test_uncategorized_data/cleanup/.buckconfig rename to tests/core/build/test_uncategorized_data/cleanup/.buckconfig diff --git a/tests/e2e/build/test_uncategorized_data/cleanup/TARGETS.fixture b/tests/core/build/test_uncategorized_data/cleanup/TARGETS.fixture similarity index 100% rename from tests/e2e/build/test_uncategorized_data/cleanup/TARGETS.fixture rename to tests/core/build/test_uncategorized_data/cleanup/TARGETS.fixture diff --git a/tests/e2e/build/test_uncategorized_data/cleanup/defs.bzl b/tests/core/build/test_uncategorized_data/cleanup/defs.bzl similarity index 100% rename from tests/e2e/build/test_uncategorized_data/cleanup/defs.bzl rename to tests/core/build/test_uncategorized_data/cleanup/defs.bzl diff --git a/tests/e2e/build/test_uncategorized_data/cleanup/prelude/prelude.bzl b/tests/core/build/test_uncategorized_data/cleanup/prelude/prelude.bzl similarity index 100% rename from tests/e2e/build/test_uncategorized_data/cleanup/prelude/prelude.bzl rename to tests/core/build/test_uncategorized_data/cleanup/prelude/prelude.bzl diff --git a/tests/e2e/build/test_uncategorized_data/concurrency/.buckconfig b/tests/core/build/test_uncategorized_data/concurrency/.buckconfig similarity index 100% rename from tests/e2e/build/test_uncategorized_data/concurrency/.buckconfig rename to tests/core/build/test_uncategorized_data/concurrency/.buckconfig diff --git a/tests/e2e/build/test_uncategorized_data/concurrency/TARGETS.fixture b/tests/core/build/test_uncategorized_data/concurrency/TARGETS.fixture similarity index 100% rename from tests/e2e/build/test_uncategorized_data/concurrency/TARGETS.fixture rename to tests/core/build/test_uncategorized_data/concurrency/TARGETS.fixture diff --git a/tests/e2e/build/test_uncategorized_data/concurrency/defs.bzl b/tests/core/build/test_uncategorized_data/concurrency/defs.bzl similarity index 100% rename from tests/e2e/build/test_uncategorized_data/concurrency/defs.bzl rename to tests/core/build/test_uncategorized_data/concurrency/defs.bzl diff --git a/tests/e2e/build/test_uncategorized_data/concurrency/prelude/prelude.bzl b/tests/core/build/test_uncategorized_data/concurrency/prelude/prelude.bzl similarity index 100% rename from tests/e2e/build/test_uncategorized_data/concurrency/prelude/prelude.bzl rename to tests/core/build/test_uncategorized_data/concurrency/prelude/prelude.bzl diff --git a/tests/e2e/build/test_uncategorized_data/fail_fast/.buckconfig b/tests/core/build/test_uncategorized_data/fail_fast/.buckconfig similarity index 100% rename from tests/e2e/build/test_uncategorized_data/fail_fast/.buckconfig rename to tests/core/build/test_uncategorized_data/fail_fast/.buckconfig diff --git a/tests/e2e/build/test_uncategorized_data/fail_fast/TARGETS.fixture b/tests/core/build/test_uncategorized_data/fail_fast/TARGETS.fixture similarity index 100% rename from tests/e2e/build/test_uncategorized_data/fail_fast/TARGETS.fixture rename to tests/core/build/test_uncategorized_data/fail_fast/TARGETS.fixture diff --git a/tests/e2e/build/test_uncategorized_data/fail_fast/defs.bzl b/tests/core/build/test_uncategorized_data/fail_fast/defs.bzl similarity index 100% rename from tests/e2e/build/test_uncategorized_data/fail_fast/defs.bzl rename to tests/core/build/test_uncategorized_data/fail_fast/defs.bzl diff --git a/tests/e2e/build/test_uncategorized_data/fail_fast/prelude/prelude.bzl b/tests/core/build/test_uncategorized_data/fail_fast/prelude/prelude.bzl similarity index 100% rename from tests/e2e/build/test_uncategorized_data/fail_fast/prelude/prelude.bzl rename to tests/core/build/test_uncategorized_data/fail_fast/prelude/prelude.bzl diff --git a/tests/e2e/build/test_uncategorized_data/invalid_file_invalidation/.buckconfig b/tests/core/build/test_uncategorized_data/invalid_file_invalidation/.buckconfig similarity index 100% rename from tests/e2e/build/test_uncategorized_data/invalid_file_invalidation/.buckconfig rename to tests/core/build/test_uncategorized_data/invalid_file_invalidation/.buckconfig diff --git a/tests/e2e/build/test_uncategorized_data/invalid_file_invalidation/TARGETS.fixture b/tests/core/build/test_uncategorized_data/invalid_file_invalidation/TARGETS.fixture similarity index 100% rename from tests/e2e/build/test_uncategorized_data/invalid_file_invalidation/TARGETS.fixture rename to tests/core/build/test_uncategorized_data/invalid_file_invalidation/TARGETS.fixture diff --git a/tests/e2e/build/test_uncategorized_data/invalid_file_invalidation/defs.bzl b/tests/core/build/test_uncategorized_data/invalid_file_invalidation/defs.bzl similarity index 100% rename from tests/e2e/build/test_uncategorized_data/invalid_file_invalidation/defs.bzl rename to tests/core/build/test_uncategorized_data/invalid_file_invalidation/defs.bzl diff --git a/tests/e2e/build/test_uncategorized_data/invalid_file_invalidation/prelude/prelude.bzl b/tests/core/build/test_uncategorized_data/invalid_file_invalidation/prelude/prelude.bzl similarity index 100% rename from tests/e2e/build/test_uncategorized_data/invalid_file_invalidation/prelude/prelude.bzl rename to tests/core/build/test_uncategorized_data/invalid_file_invalidation/prelude/prelude.bzl diff --git a/tests/e2e/build/test_uncategorized_data/invalid_file_invalidation/src/a b/tests/core/build/test_uncategorized_data/invalid_file_invalidation/src/a similarity index 100% rename from tests/e2e/build/test_uncategorized_data/invalid_file_invalidation/src/a rename to tests/core/build/test_uncategorized_data/invalid_file_invalidation/src/a diff --git a/tests/e2e/build/test_uncategorized_data/keep_going_build/.buckconfig b/tests/core/build/test_uncategorized_data/keep_going_build/.buckconfig similarity index 100% rename from tests/e2e/build/test_uncategorized_data/keep_going_build/.buckconfig rename to tests/core/build/test_uncategorized_data/keep_going_build/.buckconfig diff --git a/tests/e2e/build/test_uncategorized_data/keep_going_build/TARGETS.fixture b/tests/core/build/test_uncategorized_data/keep_going_build/TARGETS.fixture similarity index 100% rename from tests/e2e/build/test_uncategorized_data/keep_going_build/TARGETS.fixture rename to tests/core/build/test_uncategorized_data/keep_going_build/TARGETS.fixture diff --git a/tests/e2e/build/test_uncategorized_data/keep_going_build/defs.bzl b/tests/core/build/test_uncategorized_data/keep_going_build/defs.bzl similarity index 100% rename from tests/e2e/build/test_uncategorized_data/keep_going_build/defs.bzl rename to tests/core/build/test_uncategorized_data/keep_going_build/defs.bzl diff --git a/tests/e2e/build/test_uncategorized_data/keep_going_build/prelude/prelude.bzl b/tests/core/build/test_uncategorized_data/keep_going_build/prelude/prelude.bzl similarity index 100% rename from tests/e2e/build/test_uncategorized_data/keep_going_build/prelude/prelude.bzl rename to tests/core/build/test_uncategorized_data/keep_going_build/prelude/prelude.bzl diff --git a/tests/e2e/build/test_uncategorized_data/log_action_keys/.buckconfig b/tests/core/build/test_uncategorized_data/log_action_keys/.buckconfig similarity index 100% rename from tests/e2e/build/test_uncategorized_data/log_action_keys/.buckconfig rename to tests/core/build/test_uncategorized_data/log_action_keys/.buckconfig diff --git a/tests/e2e/build/test_uncategorized_data/log_action_keys/TARGETS.fixture b/tests/core/build/test_uncategorized_data/log_action_keys/TARGETS.fixture similarity index 100% rename from tests/e2e/build/test_uncategorized_data/log_action_keys/TARGETS.fixture rename to tests/core/build/test_uncategorized_data/log_action_keys/TARGETS.fixture diff --git a/tests/e2e/build/test_uncategorized_data/log_action_keys/defs.bzl b/tests/core/build/test_uncategorized_data/log_action_keys/defs.bzl similarity index 100% rename from tests/e2e/build/test_uncategorized_data/log_action_keys/defs.bzl rename to tests/core/build/test_uncategorized_data/log_action_keys/defs.bzl diff --git a/tests/e2e/build/test_uncategorized_data/log_action_keys/platforms/TARGETS.fixture b/tests/core/build/test_uncategorized_data/log_action_keys/platforms/TARGETS.fixture similarity index 100% rename from tests/e2e/build/test_uncategorized_data/log_action_keys/platforms/TARGETS.fixture rename to tests/core/build/test_uncategorized_data/log_action_keys/platforms/TARGETS.fixture diff --git a/tests/e2e/build/test_uncategorized_data/log_action_keys/platforms/defs.bzl b/tests/core/build/test_uncategorized_data/log_action_keys/platforms/defs.bzl similarity index 100% rename from tests/e2e/build/test_uncategorized_data/log_action_keys/platforms/defs.bzl rename to tests/core/build/test_uncategorized_data/log_action_keys/platforms/defs.bzl diff --git a/tests/e2e/build/test_uncategorized_data/log_action_keys/prelude/prelude.bzl b/tests/core/build/test_uncategorized_data/log_action_keys/prelude/prelude.bzl similarity index 100% rename from tests/e2e/build/test_uncategorized_data/log_action_keys/prelude/prelude.bzl rename to tests/core/build/test_uncategorized_data/log_action_keys/prelude/prelude.bzl diff --git a/tests/e2e/build/test_uncategorized_data/materialize_inputs_for_failed_actions/.buckconfig b/tests/core/build/test_uncategorized_data/materialize_inputs_for_failed_actions/.buckconfig similarity index 100% rename from tests/e2e/build/test_uncategorized_data/materialize_inputs_for_failed_actions/.buckconfig rename to tests/core/build/test_uncategorized_data/materialize_inputs_for_failed_actions/.buckconfig diff --git a/tests/e2e/build/test_uncategorized_data/materialize_inputs_for_failed_actions/TARGETS.fixture b/tests/core/build/test_uncategorized_data/materialize_inputs_for_failed_actions/TARGETS.fixture similarity index 100% rename from tests/e2e/build/test_uncategorized_data/materialize_inputs_for_failed_actions/TARGETS.fixture rename to tests/core/build/test_uncategorized_data/materialize_inputs_for_failed_actions/TARGETS.fixture diff --git a/tests/e2e/build/test_uncategorized_data/materialize_inputs_for_failed_actions/defs.bzl b/tests/core/build/test_uncategorized_data/materialize_inputs_for_failed_actions/defs.bzl similarity index 100% rename from tests/e2e/build/test_uncategorized_data/materialize_inputs_for_failed_actions/defs.bzl rename to tests/core/build/test_uncategorized_data/materialize_inputs_for_failed_actions/defs.bzl diff --git a/tests/e2e/build/test_uncategorized_data/materialize_inputs_for_failed_actions/platforms/TARGETS.fixture b/tests/core/build/test_uncategorized_data/materialize_inputs_for_failed_actions/platforms/TARGETS.fixture similarity index 100% rename from tests/e2e/build/test_uncategorized_data/materialize_inputs_for_failed_actions/platforms/TARGETS.fixture rename to tests/core/build/test_uncategorized_data/materialize_inputs_for_failed_actions/platforms/TARGETS.fixture diff --git a/tests/e2e/build/test_uncategorized_data/materialize_inputs_for_failed_actions/platforms/defs.bzl b/tests/core/build/test_uncategorized_data/materialize_inputs_for_failed_actions/platforms/defs.bzl similarity index 100% rename from tests/e2e/build/test_uncategorized_data/materialize_inputs_for_failed_actions/platforms/defs.bzl rename to tests/core/build/test_uncategorized_data/materialize_inputs_for_failed_actions/platforms/defs.bzl diff --git a/tests/e2e/build/test_uncategorized_data/materialize_inputs_for_failed_actions/prelude/prelude.bzl b/tests/core/build/test_uncategorized_data/materialize_inputs_for_failed_actions/prelude/prelude.bzl similarity index 100% rename from tests/e2e/build/test_uncategorized_data/materialize_inputs_for_failed_actions/prelude/prelude.bzl rename to tests/core/build/test_uncategorized_data/materialize_inputs_for_failed_actions/prelude/prelude.bzl diff --git a/tests/e2e/build/test_uncategorized_data/materialize_inputs_for_failed_actions/remote_only.py b/tests/core/build/test_uncategorized_data/materialize_inputs_for_failed_actions/remote_only.py similarity index 100% rename from tests/e2e/build/test_uncategorized_data/materialize_inputs_for_failed_actions/remote_only.py rename to tests/core/build/test_uncategorized_data/materialize_inputs_for_failed_actions/remote_only.py diff --git a/tests/e2e/build/test_uncategorized_data/prelude_import/.buckconfig b/tests/core/build/test_uncategorized_data/prelude_import/.buckconfig similarity index 100% rename from tests/e2e/build/test_uncategorized_data/prelude_import/.buckconfig rename to tests/core/build/test_uncategorized_data/prelude_import/.buckconfig diff --git a/tests/e2e/build/test_uncategorized_data/prelude_import/cell1/.buckconfig b/tests/core/build/test_uncategorized_data/prelude_import/cell1/.buckconfig similarity index 100% rename from tests/e2e/build/test_uncategorized_data/prelude_import/cell1/.buckconfig rename to tests/core/build/test_uncategorized_data/prelude_import/cell1/.buckconfig diff --git a/tests/e2e/build/test_uncategorized_data/prelude_import/cell1/TARGETS.fixture b/tests/core/build/test_uncategorized_data/prelude_import/cell1/TARGETS.fixture similarity index 100% rename from tests/e2e/build/test_uncategorized_data/prelude_import/cell1/TARGETS.fixture rename to tests/core/build/test_uncategorized_data/prelude_import/cell1/TARGETS.fixture diff --git a/tests/e2e/build/test_uncategorized_data/prelude_import/cell2/.buckconfig b/tests/core/build/test_uncategorized_data/prelude_import/cell2/.buckconfig similarity index 100% rename from tests/e2e/build/test_uncategorized_data/prelude_import/cell2/.buckconfig rename to tests/core/build/test_uncategorized_data/prelude_import/cell2/.buckconfig diff --git a/tests/e2e/build/test_uncategorized_data/prelude_import/cell2/TARGETS.fixture b/tests/core/build/test_uncategorized_data/prelude_import/cell2/TARGETS.fixture similarity index 100% rename from tests/e2e/build/test_uncategorized_data/prelude_import/cell2/TARGETS.fixture rename to tests/core/build/test_uncategorized_data/prelude_import/cell2/TARGETS.fixture diff --git a/tests/e2e/build/test_uncategorized_data/prelude_import/prelude/.buckconfig b/tests/core/build/test_uncategorized_data/prelude_import/prelude/.buckconfig similarity index 100% rename from tests/e2e/build/test_uncategorized_data/prelude_import/prelude/.buckconfig rename to tests/core/build/test_uncategorized_data/prelude_import/prelude/.buckconfig diff --git a/tests/e2e/build/test_uncategorized_data/prelude_import/prelude/prelude.bzl b/tests/core/build/test_uncategorized_data/prelude_import/prelude/prelude.bzl similarity index 100% rename from tests/e2e/build/test_uncategorized_data/prelude_import/prelude/prelude.bzl rename to tests/core/build/test_uncategorized_data/prelude_import/prelude/prelude.bzl diff --git a/tests/e2e/build/test_uncategorized_data/projected_artifacts/.buckconfig b/tests/core/build/test_uncategorized_data/projected_artifacts/.buckconfig similarity index 100% rename from tests/e2e/build/test_uncategorized_data/projected_artifacts/.buckconfig rename to tests/core/build/test_uncategorized_data/projected_artifacts/.buckconfig diff --git a/tests/e2e/build/test_uncategorized_data/projected_artifacts/TARGETS.fixture b/tests/core/build/test_uncategorized_data/projected_artifacts/TARGETS.fixture similarity index 100% rename from tests/e2e/build/test_uncategorized_data/projected_artifacts/TARGETS.fixture rename to tests/core/build/test_uncategorized_data/projected_artifacts/TARGETS.fixture diff --git a/tests/e2e/build/test_uncategorized_data/projected_artifacts/commands/exists.py b/tests/core/build/test_uncategorized_data/projected_artifacts/commands/exists.py similarity index 100% rename from tests/e2e/build/test_uncategorized_data/projected_artifacts/commands/exists.py rename to tests/core/build/test_uncategorized_data/projected_artifacts/commands/exists.py diff --git a/tests/e2e/build/test_uncategorized_data/projected_artifacts/commands/gen_fixture.py b/tests/core/build/test_uncategorized_data/projected_artifacts/commands/gen_fixture.py similarity index 100% rename from tests/e2e/build/test_uncategorized_data/projected_artifacts/commands/gen_fixture.py rename to tests/core/build/test_uncategorized_data/projected_artifacts/commands/gen_fixture.py diff --git a/tests/e2e/build/test_uncategorized_data/projected_artifacts/prelude/prelude.bzl b/tests/core/build/test_uncategorized_data/projected_artifacts/prelude/prelude.bzl similarity index 100% rename from tests/e2e/build/test_uncategorized_data/projected_artifacts/prelude/prelude.bzl rename to tests/core/build/test_uncategorized_data/projected_artifacts/prelude/prelude.bzl diff --git a/tests/e2e/build/test_uncategorized_data/roots/.buckconfig b/tests/core/build/test_uncategorized_data/roots/.buckconfig similarity index 100% rename from tests/e2e/build/test_uncategorized_data/roots/.buckconfig rename to tests/core/build/test_uncategorized_data/roots/.buckconfig diff --git a/tests/e2e/build/test_uncategorized_data/roots/TARGETS.fixture b/tests/core/build/test_uncategorized_data/roots/TARGETS.fixture similarity index 100% rename from tests/e2e/build/test_uncategorized_data/roots/TARGETS.fixture rename to tests/core/build/test_uncategorized_data/roots/TARGETS.fixture diff --git a/tests/e2e/build/test_uncategorized_data/roots/defs.bzl b/tests/core/build/test_uncategorized_data/roots/defs.bzl similarity index 100% rename from tests/e2e/build/test_uncategorized_data/roots/defs.bzl rename to tests/core/build/test_uncategorized_data/roots/defs.bzl diff --git a/tests/e2e/build/test_uncategorized_data/roots/other/.buckconfig b/tests/core/build/test_uncategorized_data/roots/other/.buckconfig similarity index 100% rename from tests/e2e/build/test_uncategorized_data/roots/other/.buckconfig rename to tests/core/build/test_uncategorized_data/roots/other/.buckconfig diff --git a/tests/e2e/build/test_uncategorized_data/roots/other/TARGETS.fixture b/tests/core/build/test_uncategorized_data/roots/other/TARGETS.fixture similarity index 100% rename from tests/e2e/build/test_uncategorized_data/roots/other/TARGETS.fixture rename to tests/core/build/test_uncategorized_data/roots/other/TARGETS.fixture diff --git a/tests/e2e/build/test_uncategorized_data/roots/prelude.bzl b/tests/core/build/test_uncategorized_data/roots/prelude.bzl similarity index 100% rename from tests/e2e/build/test_uncategorized_data/roots/prelude.bzl rename to tests/core/build/test_uncategorized_data/roots/prelude.bzl diff --git a/tests/e2e/build/test_uncategorized_data/tmpdir/.buckconfig b/tests/core/build/test_uncategorized_data/tmpdir/.buckconfig similarity index 100% rename from tests/e2e/build/test_uncategorized_data/tmpdir/.buckconfig rename to tests/core/build/test_uncategorized_data/tmpdir/.buckconfig diff --git a/tests/e2e/build/test_uncategorized_data/tmpdir/.buckroot b/tests/core/build/test_uncategorized_data/tmpdir/.buckroot similarity index 100% rename from tests/e2e/build/test_uncategorized_data/tmpdir/.buckroot rename to tests/core/build/test_uncategorized_data/tmpdir/.buckroot diff --git a/tests/e2e/build/test_uncategorized_data/tmpdir/TARGETS.fixture b/tests/core/build/test_uncategorized_data/tmpdir/TARGETS.fixture similarity index 100% rename from tests/e2e/build/test_uncategorized_data/tmpdir/TARGETS.fixture rename to tests/core/build/test_uncategorized_data/tmpdir/TARGETS.fixture diff --git a/tests/e2e/build/test_uncategorized_data/tmpdir/defs.bzl b/tests/core/build/test_uncategorized_data/tmpdir/defs.bzl similarity index 100% rename from tests/e2e/build/test_uncategorized_data/tmpdir/defs.bzl rename to tests/core/build/test_uncategorized_data/tmpdir/defs.bzl diff --git a/tests/e2e/build/test_uncategorized_data/tmpdir/prelude.bzl b/tests/core/build/test_uncategorized_data/tmpdir/prelude.bzl similarity index 100% rename from tests/e2e/build/test_uncategorized_data/tmpdir/prelude.bzl rename to tests/core/build/test_uncategorized_data/tmpdir/prelude.bzl diff --git a/tests/e2e/build/test_uncategorized_data/tmpdir/test.py b/tests/core/build/test_uncategorized_data/tmpdir/test.py similarity index 100% rename from tests/e2e/build/test_uncategorized_data/tmpdir/test.py rename to tests/core/build/test_uncategorized_data/tmpdir/test.py diff --git a/tests/e2e/build/test_uncategorized_data/upload_all_actions/.buckconfig b/tests/core/build/test_uncategorized_data/upload_all_actions/.buckconfig similarity index 100% rename from tests/e2e/build/test_uncategorized_data/upload_all_actions/.buckconfig rename to tests/core/build/test_uncategorized_data/upload_all_actions/.buckconfig diff --git a/tests/e2e/build/test_uncategorized_data/upload_all_actions/TARGETS.fixture b/tests/core/build/test_uncategorized_data/upload_all_actions/TARGETS.fixture similarity index 100% rename from tests/e2e/build/test_uncategorized_data/upload_all_actions/TARGETS.fixture rename to tests/core/build/test_uncategorized_data/upload_all_actions/TARGETS.fixture diff --git a/tests/e2e/build/test_uncategorized_data/upload_all_actions/defs.bzl b/tests/core/build/test_uncategorized_data/upload_all_actions/defs.bzl similarity index 100% rename from tests/e2e/build/test_uncategorized_data/upload_all_actions/defs.bzl rename to tests/core/build/test_uncategorized_data/upload_all_actions/defs.bzl diff --git a/tests/e2e/build/test_uncategorized_data/upload_all_actions/prelude/prelude.bzl b/tests/core/build/test_uncategorized_data/upload_all_actions/prelude/prelude.bzl similarity index 100% rename from tests/e2e/build/test_uncategorized_data/upload_all_actions/prelude/prelude.bzl rename to tests/core/build/test_uncategorized_data/upload_all_actions/prelude/prelude.bzl diff --git a/tests/e2e/build/BUCK b/tests/e2e/build/BUCK index d1a128868062..c9f36a8928d0 100644 --- a/tests/e2e/build/BUCK +++ b/tests/e2e/build/BUCK @@ -18,17 +18,6 @@ buck2_e2e_test( ], ) -buck2_e2e_test( - name = "test_build_output_file_hashes", - srcs = ["test_build_output_file_hashes.py"], - data_dir = "test_build_output_file_hashes_data", - env = { - "OVR_CONFIG": "1", - "PRELUDE": "$(location prelude//:prelude)", - }, - serialize_test_cases = False, -) - buck2_e2e_test( name = "test_output_cleanup", srcs = ["test_output_cleanup.py"], @@ -66,19 +55,6 @@ buck2_e2e_test( srcs = ["test_build_skip_missing.py"], ) -buck2_e2e_test( - name = "test_build_skip_incompatible_targets", - srcs = ["test_build_skip_incompatible_targets.py"], - data_dir = "test_build_skip_incompatible_targets_data", -) - -buck2_e2e_test( - name = "test_build_root_executable", - srcs = ["test_build_root_executable.py"], - data_dir = "test_build_root_executable_data", - serialize_test_cases = False, -) - buck2_e2e_test( name = "test_paranoid", srcs = ["test_paranoid.py"], @@ -86,144 +62,6 @@ buck2_e2e_test( serialize_test_cases = False, ) -buck2_e2e_test( - name = "test_plugins", - srcs = ["test_plugins.py"], - data_dir = "test_plugins_data", - serialize_test_cases = False, -) - -buck2_e2e_test( - name = "test_uncategorized", - srcs = ["test_uncategorized.py"], - data_dir = "test_uncategorized_data", - env = { - "RECLI": "$(location fbsource//xplat/remote_execution/dotslash:recli)", - }, - serialize_test_cases = False, - deps = [ - "fbcode//buck2/tests/e2e_util:utils", - ], -) - -buck2_e2e_test( - name = "test_hash_all_commands", - srcs = ["test_hash_all_commands.py"], - data_dir = "test_hash_all_commands_data", - # These tests heavily depend on watchman, which is flakey on non-Linux systems - skip_for_os = [ - "darwin", - "windows", - ], - deps = [ - "fbcode//buck2/tests/e2e_util:utils", - ], -) - -buck2_e2e_test( - name = "test_dep_files", - srcs = ["test_dep_files.py"], - data_dir = "test_dep_files_data", - deps = [ - "fbcode//buck2/tests/e2e_util:utils", - ], -) - -buck2_e2e_test( - name = "test_target_aliases", - srcs = ["test_target_aliases.py"], - data_dir = "test_target_aliases_data", -) - -buck2_e2e_test( - name = "test_symlinks", - srcs = ["test_symlinks.py"], - data_dir = "test_symlinks_data", - deps = [ - "fbcode//buck2/tests/e2e_util:utils", - ], -) - -buck2_e2e_test( - name = "test_out_flag", - srcs = ["test_out_flag.py"], - data_dir = "test_out_flag_data", - env = { - "OVR_CONFIG": "1", - "PRELUDE": "$(location prelude//:prelude)", - }, -) - -buck2_e2e_test( - name = "test_nested_subtargets", - srcs = ["test_nested_subtargets.py"], - data_dir = "test_nested_subtargets_data", - env = { - "OVR_CONFIG": "1", - "PRELUDE": "$(location prelude//:prelude)", - }, -) - -buck2_e2e_test( - name = "test_build_report", - srcs = ["test_build_report.py"], - data_dir = "test_build_report_data", - env = { - "OVR_CONFIG": "1", - "PRELUDE": "$(location prelude//:prelude)", - }, - deps = [ - "//buck2/tests/e2e_util:utils", - ], -) - -buck2_e2e_test( - name = "test_build_report_errors", - srcs = ["test_build_report_errors.py"], - data_dir = "test_build_report_errors_data", - deps = [ - "fbcode//buck2/tests/e2e_util:golden", - ], -) - -buck2_e2e_test( - name = "test_modify", - srcs = ["test_modify.py"], - data_dir = "test_modify_data", - env = { - "OVR_CONFIG": "1", - "PRELUDE": "$(location prelude//:prelude)", - }, - deps = [ - "//buck2/tests/e2e_util:utils", - ], -) - -buck2_e2e_test( - name = "test_build_id_env_var", - srcs = ["test_build_id_env_var.py"], - data_dir = "test_build_id_env_var_data", - deps = [ - "//buck2/tests/e2e_util:utils", - ], -) - -buck2_e2e_test( - name = "test_cancellation", - srcs = ["test_cancellation.py"], - data_dir = "test_cancellation_data", - skip_for_os = ["windows"], -) - -buck2_e2e_test( - name = "test_critical_path", - srcs = ["test_critical_path.py"], - data_dir = "test_critical_path_data", - deps = [ - "//buck2/tests/e2e_util:utils", - ], -) - buck2_e2e_test( name = "test_error_categorization", srcs = ["test_error_categorization.py"], @@ -233,41 +71,6 @@ buck2_e2e_test( ], ) -buck2_e2e_test( - name = "test_build_response", - srcs = ["test_build_response.py"], - data_dir = "test_build_response_data", - env = { - "OVR_CONFIG": "1", - "PRELUDE": "$(location prelude//:prelude)", - }, - deps = [ - "//buck2/tests/e2e_util:utils", - ], -) - -buck2_e2e_test( - name = "test_build_rule_type_name_logging", - srcs = ["test_build_rule_type_name_logging.py"], - data_dir = "test_build_rule_type_name_logging_data", - env = { - "OVR_CONFIG": "1", - "PRELUDE": "$(location prelude//:prelude)", - }, - deps = [ - "//buck2/tests/e2e_util:utils", - ], -) - -buck2_e2e_test( - name = "test_executor_with_dependencies", - srcs = ["test_executor_with_dependencies.py"], - data_dir = "test_executor_with_dependencies_data", - deps = [ - "//buck2/tests/e2e_util:utils", - ], -) - buck2_e2e_test( name = "test_worker", srcs = ["test_worker.py"], @@ -277,24 +80,6 @@ buck2_e2e_test( ], ) -buck2_e2e_test( - name = "test_action_error_handler_types", - srcs = ["test_action_error_handler_types.py"], - data_dir = "test_action_error_handler_types_data", - deps = [ - "//buck2/tests/e2e_util:utils", - ], -) - -buck2_e2e_test( - name = "test_build_system_info", - srcs = ["test_build_system_info.py"], - data_dir = "test_build_system_info_data", - deps = [ - "//buck2/tests/e2e_util:utils", - ], -) - buck2_e2e_test( name = "test_action_digest", srcs = ["test_action_digest.py"], @@ -311,12 +96,3 @@ buck2_e2e_test( "//buck2/tests/e2e_util:utils", ], ) - -buck2_e2e_test( - name = "test_remote_execution", - srcs = ["test_remote_execution.py"], - data_dir = "test_remote_execution_data", - deps = [ - "//buck2/tests/e2e_util:utils", - ], -)