Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WPT/common/security-features] Move per-project config into spec.src.json #21123

Merged
merged 1 commit into from Jan 15, 2020

Conversation

chromium-wpt-export-bot
Copy link
Collaborator

@chromium-wpt-export-bot chromium-wpt-export-bot commented Jan 10, 2020

[1] will enable sub projects inheriting parent's spec.src.json,
in order to generate similar but subtlely different tests.
As a preparation for [1],
this CL centralizes per-project configs into spec.src.json,
by moving config values from per-project generate.py into spec.src.json.

  • spec_directory is now the current directory,
    or specified by the --spec command line option,
    while previously it is calculated based on the per-project generate.py's path.
  • Script paths (helper_js, sanity_checker_js, spec_json_js) are now hard-coded
    (using spec_directory) in common/security-features/tools/generate.py.
  • Other config values are moved into spec.src.json.
  • spec_json.js is moved under generic/, to a little centralize
    generator-related files into generic/.

Generated files are affected because:

  • Scripts (like test-case.sub.js) are now referenced as relative paths
    from generated test HTMLs.
  • disclaimer.template is updated.

Generated files will be updated in a separate CL [2].

[1] https://chromium-review.googlesource.com/c/chromium/src/+/1991066/
[2] https://chromium-review.googlesource.com/c/chromium/src/+/1992955/

Bug: 906850
Change-Id: Id3b2a26b67296a1de2b682e07bdcf473f666cd25
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1989718
Commit-Queue: Hiroshige Hayashizaki <hiroshige@chromium.org>
Reviewed-by: Hiroki Nakagawa <nhiroki@chromium.org>
Cr-Commit-Position: refs/heads/master@{#731858}

Copy link
Collaborator

@wpt-pr-bot wpt-pr-bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The review process for this patch is being conducted in the Chromium project.

…json

[1] will enable sub projects inheriting parent's `spec.src.json`,
in order to generate similar but subtlely different tests.
As a preparation for [1],
this CL centralizes per-project configs into `spec.src.json`,
by moving config values from per-project `generate.py` into `spec.src.json`.

- `spec_directory` is now the current directory,
  or specified by the `--spec` command line option,
  while previously it is calculated based on the per-project `generate.py`'s path.
- Script paths (`helper_js`, `sanity_checker_js`, `spec_json_js`) are now hard-coded
  (using `spec_directory`) in `common/security-features/tools/generate.py`.
- Other config values are moved into `spec.src.json`.
- `spec_json.js` is moved under `generic/`, to a little centralize
  generator-related files into `generic/`.

Generated files are affected because:

- Scripts (like `test-case.sub.js`) are now referenced as relative paths
  from generated test HTMLs.
- `disclaimer.template` is updated.

Generated files will be updated in a separate CL [2].

[1] https://chromium-review.googlesource.com/c/chromium/src/+/1991066/
[2] https://chromium-review.googlesource.com/c/chromium/src/+/1992955/

Bug: 906850
Change-Id: Id3b2a26b67296a1de2b682e07bdcf473f666cd25
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1989718
Commit-Queue: Hiroshige Hayashizaki <hiroshige@chromium.org>
Reviewed-by: Hiroki Nakagawa <nhiroki@chromium.org>
Cr-Commit-Position: refs/heads/master@{#731858}
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants