Skip to content

Commit 031b006

Browse files
ADKastertrflynn89
authored andcommitted
Update results script with current expected binary paths
Also update README.md to reflect the current reality of building the runner.
1 parent f680ea3 commit 031b006

File tree

2 files changed

+18
-14
lines changed

2 files changed

+18
-14
lines changed

README.md

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,23 +18,19 @@ Dependencies are:
1818

1919
## Usage
2020

21-
To clone test262, clone SerenityOS, build Lagom, and build `libjs-test262-runner`, run:
21+
To clone test262, clone serenity and build Lagom run:
2222

2323
```console
2424
./setup.sh
2525
```
2626

27-
The repositories will only be cloned if they don't exist yet locally, so you
28-
can use this script for development of the test runner as well.
29-
30-
If `SERENITY_SOURCE_DIR` is set, it will be used instead. However, if the Lagom
31-
build directory already exists, the script will not touch your build in that
32-
case, so you'll need to build `libLagom.a` yourself.
27+
The repositories will only be cloned if they don't exist yet locally.
28+
If `SERENITY_SOURCE_DIR` is set, it will be used to compile the runner instead of cloning serenity.
3329

3430
Once that's done, run:
3531

3632
```console
37-
python3 main.py --libjs-test262-runner ./Build/_deps/lagom-build/bin/test262-runner --test262-root ./test262/
33+
python3 main.py --libjs-test262-runner ./Build/bin/test262-runner --test262-root ./test262/
3834
```
3935

4036
## Options

run_all_and_update_results.py

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,21 @@ def get_git_commit_timestamp(path: Path) -> int:
3030

3131

3232
def find_lagom_executable(test262_path: Path, serenity_path: Path, name: str):
33-
executable_path = test262_path / f"Build/_deps/lagom-build/bin/{name}"
34-
if not executable_path.exists():
35-
executable_path = serenity_path / f"Build/lagom/bin/{name}"
36-
if not executable_path.exists():
37-
executable_path = serenity_path / f"Build/lagom/Meta/Lagom/bin/{name}"
33+
# Build/bin: Local build
34+
# serenity_path / Build/lagom/bin: Meta/Lagom source dir
35+
# _deps: Local build before 2023-08-13
3836

39-
return executable_path
37+
paths = [
38+
test262_path / f"Build/bin/{name}",
39+
serenity_path / f"Build/lagom/bin/{name}",
40+
test262_path / f"Build/_deps/lagom-build/bin/{name}",
41+
]
42+
43+
for path in paths:
44+
if path.exists():
45+
return path
46+
47+
raise RuntimeError(f"Unable to find {name}")
4048

4149

4250
def main() -> None:

0 commit comments

Comments
 (0)