From 5b74d6f8954d073ca750c46d1334782135945938 Mon Sep 17 00:00:00 2001 From: Iban Eguia Date: Wed, 30 Sep 2020 18:39:42 +0200 Subject: [PATCH] Fix test262 result uploading in CI (#743) --- .github/workflows/test262.yml | 9 ++++-- Cargo.lock | 40 +++++++++++++-------------- Cargo.toml | 2 +- {tester => boa_tester}/Cargo.toml | 0 {tester => boa_tester}/src/exec.rs | 0 {tester => boa_tester}/src/main.rs | 16 +++++------ {tester => boa_tester}/src/read.rs | 0 {tester => boa_tester}/src/results.rs | 0 test262 | 2 +- 9 files changed, 35 insertions(+), 34 deletions(-) rename {tester => boa_tester}/Cargo.toml (100%) rename {tester => boa_tester}/src/exec.rs (100%) rename {tester => boa_tester}/src/main.rs (96%) rename {tester => boa_tester}/src/read.rs (100%) rename {tester => boa_tester}/src/results.rs (100%) diff --git a/.github/workflows/test262.yml b/.github/workflows/test262.yml index 7c953a4d94..dcc68853d2 100644 --- a/.github/workflows/test262.yml +++ b/.github/workflows/test262.yml @@ -18,6 +18,7 @@ jobs: uses: actions/checkout@v2 with: submodules: true + path: boa - name: Install the Rust toolchain uses: actions-rs/toolchain@v1 with: @@ -37,7 +38,7 @@ jobs: - name: Cache cargo build uses: actions/cache@v1 with: - path: target + path: boa/target key: ${{ runner.os }}-cargo-build-target-${{ hashFiles('**/Cargo.lock') }} # Run the test suite and upload the results @@ -47,10 +48,12 @@ jobs: with: ref: gh-pages path: gh-pages - - run: mkdir -p gh-pages/test262 - name: Run the test262 test suite - run: cargo run --release --bin boa_tester -- -o gh-pages/test262 + run: | + cd boa + cargo run --release --bin boa_tester -- -o ../gh-pages/test262 + cd .. - name: Commit files if: github.event_name == 'push' diff --git a/Cargo.lock b/Cargo.lock index c2dbbead11..dc0778eda7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -168,9 +168,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.59" +version = "1.0.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66120af515773fb005778dc07c261bd201ec8ce50bd6e7144c927753fe013381" +checksum = "ef611cc68ff783f18535d77ddd080185275713d852c4f5cbb6122c462a7a825c" [[package]] name = "cfg-if" @@ -180,9 +180,9 @@ checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" [[package]] name = "chrono" -version = "0.4.18" +version = "0.4.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d021fddb7bd3e734370acfa4a83f34095571d8570c039f1420d77540f68d5772" +checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73" dependencies = [ "libc", "num-integer", @@ -366,9 +366,9 @@ checksum = "134951f4028bdadb9b84baf4232681efbf277da25144b9b0ad65df75946c422b" [[package]] name = "either" -version = "1.6.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd56b59865bce947ac5958779cfa508f6c3b9497cc762b7e24a12d11ccde2c4f" +checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" [[package]] name = "float-cmp" @@ -434,9 +434,9 @@ checksum = "d36fab90f82edc3c747f9d438e06cf0a491055896f2a279638bb5beed6c40177" [[package]] name = "hashbrown" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00d63df3d41950fb462ed38308eea019113ad1508da725bbedcd0fa5a85ef5f7" +checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04" [[package]] name = "heck" @@ -449,9 +449,9 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.1.15" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3deed196b6e7f9e44a2ae8d94225d80302d81208b1bb673fd21fe634645c85a9" +checksum = "4c30f6d0bc6b00693347368a67d41b58f2fb851215ff1da49e90fe2c5c667151" dependencies = [ "libc", ] @@ -583,9 +583,9 @@ dependencies = [ [[package]] name = "memoffset" -version = "0.5.5" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c198b026e1bbf08a937e94c6c60f9ec4a2267f5b0d2eec9c1b21b061ce2be55f" +checksum = "043175f069eda7b85febe4a74abbaeff828d9f8b448515d3151a14a3542811aa" dependencies = [ "autocfg", ] @@ -725,9 +725,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.21" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36e28516df94f3dd551a587da5357459d9b36d945a7c37c3557928c1c2ff2a2c" +checksum = "51ef7cd2518ead700af67bf9d1a658d90b6037d77110fd9c0445429d0ba1c6c9" dependencies = [ "unicode-xid", ] @@ -784,9 +784,9 @@ dependencies = [ [[package]] name = "rayon" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfd016f0c045ad38b5251be2c9c0ab806917f82da4d36b2a327e5166adad9270" +checksum = "dcf6960dc9a5b4ee8d3e4c5787b4a112a8818e0290a42ff664ad60692fdf2032" dependencies = [ "autocfg", "crossbeam-deque", @@ -796,9 +796,9 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.8.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91739a34c4355b5434ce54c9086c5895604a9c278586d1f1aa95e04f66b525a0" +checksum = "e8c4fec834fb6e6d2dd5eece3c7b432a52f0ba887cf40e595190c4107edc08bf" dependencies = [ "crossbeam-channel", "crossbeam-deque", @@ -1043,9 +1043,9 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.41" +version = "1.0.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6690e3e9f692504b941dc6c3b188fd28df054f7fb8469ab40680df52fdcc842b" +checksum = "9c51d92969d209b54a98397e1b91c8ae82d8c87a7bb87df0b29aa2ad81454228" dependencies = [ "proc-macro2", "quote", diff --git a/Cargo.toml b/Cargo.toml index a3b2b1f608..fc0a914b72 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,7 +3,7 @@ members = [ "boa", "boa_cli", "boa_wasm", - "tester", + "boa_tester", ] # The release profile, used for `cargo build --release`. diff --git a/tester/Cargo.toml b/boa_tester/Cargo.toml similarity index 100% rename from tester/Cargo.toml rename to boa_tester/Cargo.toml diff --git a/tester/src/exec.rs b/boa_tester/src/exec.rs similarity index 100% rename from tester/src/exec.rs rename to boa_tester/src/exec.rs diff --git a/tester/src/main.rs b/boa_tester/src/main.rs similarity index 96% rename from tester/src/main.rs rename to boa_tester/src/main.rs index 3fb6a62cc7..5acb18c64b 100644 --- a/tester/src/main.rs +++ b/boa_tester/src/main.rs @@ -117,15 +117,13 @@ fn main() { let results = global_suite.run(&harness); println!(); - if CLI.verbose() { - println!("Results:"); - println!("Total tests: {}", results.total); - println!("Passed tests: {}", results.passed); - println!( - "Conformance: {:.2}%", - (results.passed as f64 / results.total as f64) * 100.0 - ) - } + println!("Results:"); + println!("Total tests: {}", results.total); + println!("Passed tests: {}", results.passed); + println!( + "Conformance: {:.2}%", + (results.passed as f64 / results.total as f64) * 100.0 + ); write_json(results).expect("could not write the results to the output JSON file"); } diff --git a/tester/src/read.rs b/boa_tester/src/read.rs similarity index 100% rename from tester/src/read.rs rename to boa_tester/src/read.rs diff --git a/tester/src/results.rs b/boa_tester/src/results.rs similarity index 100% rename from tester/src/results.rs rename to boa_tester/src/results.rs diff --git a/test262 b/test262 index 896994413c..323905b70e 160000 --- a/test262 +++ b/test262 @@ -1 +1 @@ -Subproject commit 896994413cad849f470cec7757c4bb7d1b4ffc12 +Subproject commit 323905b70e644d90faa957235f8ac59eac4ba8ba