Skip to content

Commit 66ec88f

Browse files
Number each section in ReadMe.md and add more clarifications
https://bugs.webkit.org/show_bug.cgi?id=175687 Rubber-stamped by Joseph Pecoraro. Numbered each section and added more clarifications per issues Aakash encountered. * ReadMe.md: git-svn-id: http://svn.webkit.org/repository/webkit/trunk@220882 268f45cc-cd09-0410-ab3c-d52691b4dbfc
1 parent 66bd567 commit 66ec88f

File tree

2 files changed

+32
-19
lines changed

2 files changed

+32
-19
lines changed

Websites/perf.webkit.org/ChangeLog

+11
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
2017-08-17 Ryosuke Niwa <[email protected]>
2+
3+
Number each section in ReadMe.md and add more clarifications
4+
https://bugs.webkit.org/show_bug.cgi?id=175687
5+
6+
Rubber-stamped by Joseph Pecoraro.
7+
8+
Numbered each section and added more clarifications per issues Aakash encountered.
9+
10+
* ReadMe.md:
11+
112
2017-08-17 Ryosuke Niwa <[email protected]>
213

314
Build fix. Make the test work with the latest versions of node modules.

Websites/perf.webkit.org/ReadMe.md

+21-19
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,22 @@
22

33
The WebKit performane dashboard is a website to track various performance metrics of WebKit: https://perf.webkit.org/
44

5-
## Checking Out the Code and Installing Required Applications
5+
## 1. Checking Out the Code and Installing Required Applications
66

77
The instructions assume you're using macOS as the host server and installing this application at `/Volumes/Data/perf.webkit.org`.
88

99
You can choose between using Server.app or install the required tools separately.
1010

11-
1. Install Server.app (if you don't want to use Server.app, install PostgreSQL: http://www.postgresql.org/download/macosx/)
11+
1. Install Server.app but do **NOT** launch/open it. (if you don't want to use Server.app, install PostgreSQL: http://www.postgresql.org/download/macosx/)
1212
2. Install node.
1313
3. Install Xcode with command line tools (only needed for svn)
1414
4. `svn co https://svn.webkit.org/repository/webkit/trunk/Websites/perf.webkit.org /Volumes/Data/perf.webkit.org`
1515
5. Inside `/Volumes/Data/perf.webkit.org`, run `npm install pg` and `mkdir -m 755 public/data/`
1616

17-
## Testing Local UI Changes with Production Data
17+
## 2. Testing Local UI Changes with Production Data
1818

1919
The front end has the capability to pull data from a production server without replicating the database locally on OS X Yosemite and later.
20-
To use this feature, modify `config.json`'s `remoteServer` entry so that "remoteServer.url" points to your production server,
20+
To use this feature to test local UI changes, modify `config.json`'s `remoteServer` entry so that "remoteServer.url" points to your production server,
2121
and "remoteServer.basicAuth" specifies the username and the password that is used by the production sever.
2222

2323
Remove "basicAuth" entry for production servers that doesn't require a basic authentication (e.g. perf.webkit.org).
@@ -37,18 +37,20 @@ Then run `tools/remote-cache-server.py start`. This launches a httpd server on p
3737
The script caches remote server's responses under `public/data/remote-cache` and never revalidates them (to allow offline work).
3838
If you needed the latest content, delete caches stored in this directory by running `tools/remote-cache-server.py reset`.
3939

40-
## Running Tests
40+
## 3. Running Tests
4141

4242
There are three kinds of tests in directories of the same name: `unit-tests`, `server tests`, and `browser-tests`.
4343

4444
- `unit-tests`: These tests various models and common JS code used in v3 UI and tools. They mock JSON APIs and model object.
4545
- `server-tests`: Server tests use a real Apache server in accordance with `testServer` in `config.json` and a Postgres database by the name of `testDatabaseName` specified in `config.json`. They're functional tests and may test both the backend database schema, PHP, and corresponding front-end code although many of them directly queries and modifies the database.
4646
- `browser-tests`: These are tests to be ran inside a Web browser, and tests v3 UI's interaction with browser's DOM API.
4747

48-
To run `unit-tests` and `server-tests`, simply run `./tools/run-tests.py` after installing dependencies and configuring the PostgreSQL.
48+
To run `unit-tests` and `server-tests`, simply run `./tools/run-tests.py` after installing dependencies (1) and configuring the PostgreSQL (4).
49+
If you've previously setup a remote cache server (3), then you have to stop the server before running the tests.
50+
4951
To run `browser-tests`, open `browser-tests/index.html` inside a Web browser.
5052

51-
## Configuring PostgreSQL
53+
## 4. Configuring PostgreSQL
5254

5355
Run the following command to setup a Postgres server at `/Volumes/Data/perf.webkit.org/PostgresSQL` (or wherever you'd prefer):
5456
`python ./tools/setup-database.py /Volumes/Data/perf.webkit.org/PostgresSQL`
@@ -76,17 +78,10 @@ Use `pg_dump` and `pg_restore` to backup and restore the database. If you're rep
7678
- Making an abridged backup without `run_iterations` table: `/Applications/Server.app/Contents/ServerRoot/usr/bin/pg_dump -h localhost webkit-perf-db --format=directory --jobs=4 --no-owner --compress=7 --exclude-table=run_iterations --file=<path to backup directory>`
7779

7880
- Restoring the database: `/Applications/Server.app/Contents/ServerRoot/usr/bin/pg_restore --format=directory --jobs=4 --no-owner --host localhost --username=webkit-perf-db-user --dbname=webkit-perf-db <path to backup directory>`
79-
80-
## Configuring Apache
81-
82-
### Instructions if you're using Server.app
8381

84-
- Enable PHP web applications
85-
- Go to Server Website / Store Site Files In, change it to `/Volumes/Data/perf.webkit.org/public/`
86-
- Go to Server Website / Edit advanced settings, enable Allow overrides using .htaccess files
87-
- httpd config file is located at `/Library/Server/Web/Config/apache2/sites/0000_any_80.conf` (and/or 0000_any_`PORT#`.conf)
82+
## 5. Configuring Apache
8883

89-
### Instructions if you're not using Server.app
84+
### Instructions if you've never launched Server.app as instructed
9085

9186
- Edit `/private/etc/apache2/httpd.conf`
9287

@@ -100,6 +95,13 @@ Use `pg_dump` and `pg_restore` to backup and restore the database. If you're rep
10095
- In El Capitan and later, you may need to comment out the `LockFile` directive in `/private/etc/apache2/extra/httpd-mpm.conf`
10196
as the directive has been superseded by `Mutex` directive.
10297

98+
### Instructions if you've accidentally launched Server.app
99+
100+
- Enable PHP web applications
101+
- Go to Server Website / Store Site Files In, change it to `/Volumes/Data/perf.webkit.org/public/`
102+
- Go to Server Website / Edit advanced settings, enable Allow overrides using .htaccess files
103+
- httpd config file is located at `/Library/Server/Web/Config/apache2/sites/0000_any_80.conf` (and/or 0000_any_`PORT#`.conf)
104+
103105
### Starting Apache
104106

105107
You can use apachectl to start/stop/restart apache server from the command line:
@@ -149,7 +151,7 @@ AuthUserFile "<Realm>"
149151
Require valid-user
150152
```
151153

152-
## Concepts
154+
## 6. Concepts
153155

154156
- **Test** - A test is a collection of metrics such as frame rate and malloced bytes. It can have a children and a parent and form a tree of tests.
155157
- **Metric** - A specific metric of a test such as frame rate, runs per second, and time. The list of supported metrics are:
@@ -180,7 +182,7 @@ Require valid-user
180182

181183
See [init-database.sql](init-database.sql) for the complete database schema.
182184

183-
## Data Models for Test Results
185+
## 7. Data Models for Test Results
184186

185187
In the performance dashboard, each test can have a parent test or arbitrary many child tests or subtests. Each test can then have multiple metrics to measure a specific unit'ed value. For example, Speedometer benchmark has the top level score, which is computed by the total time of running subtests. As such, the top level test has two metrics: *Score* and *Time* which is the aggregated total sum of *Time* metrics of the subtests:
186188

@@ -219,7 +221,7 @@ Each *test run* are related to one another via *builds* which is uniquely identi
219221
+ Iteration 2: 395
220222
+ ...
221223

222-
## Reporting Results
224+
## 8. Reporting Results
223225

224226
To submit a new *build*, or a set of data points to an instance of the performance dashboard, you need to do the following:
225227

0 commit comments

Comments
 (0)