Skip to content

Commit

Permalink
's/SERENITY_SOURCE_DIR/LADYBIRD_SOURCE_DIR/g'
Browse files Browse the repository at this point in the history
  • Loading branch information
ADKaster committed Jun 18, 2024
1 parent b7e2587 commit 8b54d73
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ To clone test262, clone ladybird and build Lagom run:
```

The repositories will only be cloned if they don't exist yet locally.
If `SERENITY_SOURCE_DIR` is set, it will be used to compile the runner instead of cloning ladybird.
If `LADYBIRD_SOURCE_DIR` is set, it will be used to compile the runner instead of cloning ladybird.

Once that's done, run:

Expand Down
6 changes: 3 additions & 3 deletions cmake/FetchLagom.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ FetchContent_Declare(lagom
)

# Allow developers to skip download/update steps with local checkout
if (SERENITY_SOURCE_DIR)
set(FETCHCONTENT_SOURCE_DIR_LAGOM ${SERENITY_SOURCE_DIR} CACHE PATH "Developer's pre-existing serenity source directory" FORCE)
message(STATUS "Using pre-existing SERENITY_SOURCE_DIR: ${SERENITY_SOURCE_DIR}")
if (LADYBIRD_SOURCE_DIR)
set(FETCHCONTENT_SOURCE_DIR_LAGOM ${LADYBIRD_SOURCE_DIR} CACHE PATH "Developer's pre-existing serenity source directory" FORCE)
message(STATUS "Using pre-existing LADYBIRD_SOURCE_DIR: ${LADYBIRD_SOURCE_DIR}")
endif()

# Can't use FetchContent_MakeAvailable b/c we want to use the Lagom build, not the main build
Expand Down
2 changes: 1 addition & 1 deletion run_all_and_update_results.py
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ def main() -> None:
test_js_output = json.loads(
run_command(
f"{serenity_test_js} --test262-parser-tests {test262_parser_tests} --json",
env={"SERENITY_SOURCE_DIR": str(serenity)},
env={"LADYBIRD_SOURCE_DIR": str(serenity)},
)
)
test_js_results = test_js_output["results"]["tests"]
Expand Down
2 changes: 1 addition & 1 deletion setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ fi
mkdir -p "${LIBJS_TEST262_BUILD_DIR}"
pushd "${LIBJS_TEST262_BUILD_DIR}"
log libjs-test262-runner "Running CMake..."
cmake -GNinja .. -DSERENITY_SOURCE_DIR="${SERENITY_SOURCE_DIR}"
cmake -GNinja .. -DLADYBIRD_SOURCE_DIR="${LADYBIRD_SOURCE_DIR}"

log libjs-test262-runner "Building..."
cmake --build . --target test262-runner test-js
Expand Down

0 comments on commit 8b54d73

Please sign in to comment.