Rust编写的JavaScript引擎,该项目是一个试验性质的项目。
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

473 lines
14 KiB

use crate::{Statistics, VersionedStats};
use super::SuiteResult;
use color_eyre::{eyre::WrapErr, Result};
use rustc_hash::FxHashSet;
use serde::{Deserialize, Serialize};
use std::{
env, fs,
io::{BufReader, BufWriter},
path::Path,
};
/// Structure to store full result information.
#[derive(Debug, Clone, Deserialize, Serialize)]
struct ResultInfo {
#[serde(rename = "c")]
commit: Box<str>,
#[serde(rename = "u")]
test262_commit: Box<str>,
#[serde(rename = "r")]
results: SuiteResult,
}
/// Structure to store full result information.
#[derive(Debug, Clone, Deserialize, Serialize)]
struct ReducedResultInfo {
#[serde(rename = "c")]
commit: Box<str>,
#[serde(rename = "u")]
test262_commit: Box<str>,
#[serde(rename = "a")]
stats: Statistics,
#[serde(rename = "av", default)]
versioned_stats: VersionedStats,
}
impl From<ResultInfo> for ReducedResultInfo {
/// Creates a new reduced suite result from a full suite result.
fn from(info: ResultInfo) -> Self {
Self {
commit: info.commit,
test262_commit: info.test262_commit,
stats: info.results.stats,
versioned_stats: info.results.versioned_stats,
}
}
}
#[derive(Debug, Clone, Deserialize, Serialize)]
struct FeaturesInfo {
#[serde(rename = "c")]
commit: Box<str>,
#[serde(rename = "u")]
test262_commit: Box<str>,
#[serde(rename = "n")]
suite_name: Box<str>,
#[serde(rename = "f")]
features: FxHashSet<String>,
}
impl From<ResultInfo> for FeaturesInfo {
fn from(info: ResultInfo) -> Self {
Self {
commit: info.commit,
test262_commit: info.test262_commit,
suite_name: info.results.name,
features: info.results.features,
}
}
}
/// File name of the "latest results" JSON file.
const LATEST_FILE_NAME: &str = "latest.json";
/// File name of the "all results" JSON file.
const RESULTS_FILE_NAME: &str = "results.json";
/// File name of the "features" JSON file.
const FEATURES_FILE_NAME: &str = "features.json";
/// Writes the results of running the test suite to the given JSON output file.
///
/// It will append the results to the ones already present, in an array.
pub(crate) fn write_json(
results: SuiteResult,
output_dir: &Path,
verbose: u8,
test262_path: &Path,
) -> Result<()> {
let mut branch = env::var("GITHUB_REF").unwrap_or_default();
if branch.starts_with("refs/pull") {
branch = "pull".to_owned();
}
let output_dir = if branch.is_empty() {
output_dir.to_path_buf()
} else {
let folder = output_dir.join(branch);
fs::create_dir_all(&folder)?;
folder
};
if verbose != 0 {
println!("Writing the results to {}...", output_dir.display());
}
// Write the latest results.
let latest = output_dir.join(LATEST_FILE_NAME);
let new_results = ResultInfo {
commit: env::var("GITHUB_SHA").unwrap_or_default().into_boxed_str(),
test262_commit: get_test262_commit(test262_path)?,
results,
};
let latest = BufWriter::new(fs::File::create(latest)?);
serde_json::to_writer(latest, &new_results)?;
// Write the full list of results, retrieving the existing ones first.
let all_path = output_dir.join(RESULTS_FILE_NAME);
let mut all_results: Vec<ReducedResultInfo> = if all_path.exists() {
serde_json::from_reader(BufReader::new(fs::File::open(&all_path)?))?
} else {
Vec::new()
};
all_results.push(new_results.clone().into());
let output = BufWriter::new(fs::File::create(&all_path)?);
serde_json::to_writer(output, &all_results)?;
if verbose != 0 {
println!("Results written correctly");
}
// Write the full list of features, existing features go first.
let features = output_dir.join(FEATURES_FILE_NAME);
let mut all_features: Vec<FeaturesInfo> = if features.exists() {
serde_json::from_reader(BufReader::new(fs::File::open(&features)?))?
} else {
Vec::new()
};
all_features.push(new_results.into());
let features = BufWriter::new(fs::File::create(&features)?);
serde_json::to_writer(features, &all_features)?;
if verbose != 0 {
println!("Features written correctly");
}
Ok(())
}
/// Gets the commit OID of the test262 submodule.
fn get_test262_commit(test262_path: &Path) -> Result<Box<str>> {
let main_head_path = test262_path.join(".git/refs/heads/main");
let mut commit_id = fs::read_to_string(main_head_path)?;
// Remove newline.
commit_id.pop();
Ok(commit_id.into_boxed_str())
}
/// Compares the results of two test suite runs.
#[allow(clippy::cast_possible_wrap)]
pub(crate) fn compare_results(base: &Path, new: &Path, markdown: bool) -> Result<()> {
let base_results: ResultInfo = serde_json::from_reader(BufReader::new(
fs::File::open(base).wrap_err("could not open the base results file")?,
))
.wrap_err("could not read the base results")?;
let new_results: ResultInfo = serde_json::from_reader(BufReader::new(
fs::File::open(new).wrap_err("could not open the new results file")?,
))
.wrap_err("could not read the new results")?;
let base_total = base_results.results.stats.total as isize;
let new_total = new_results.results.stats.total as isize;
let total_diff = new_total - base_total;
let base_passed = base_results.results.stats.passed as isize;
let new_passed = new_results.results.stats.passed as isize;
let passed_diff = new_passed - base_passed;
let base_ignored = base_results.results.stats.ignored as isize;
let new_ignored = new_results.results.stats.ignored as isize;
let ignored_diff = new_ignored - base_ignored;
let base_failed = base_total - base_passed - base_ignored;
let new_failed = new_total - new_passed - new_ignored;
let failed_diff = new_failed - base_failed;
let base_panics = base_results.results.stats.panic as isize;
let new_panics = new_results.results.stats.panic as isize;
let panic_diff = new_panics - base_panics;
let base_conformance = (base_passed as f64 / base_total as f64) * 100_f64;
let new_conformance = (new_passed as f64 / new_total as f64) * 100_f64;
let conformance_diff = new_conformance - base_conformance;
let test_diff = compute_result_diff(Path::new(""), &base_results.results, &new_results.results);
if markdown {
Removed some non-needed dependencies (#2246) <!--- Thank you for contributing to Boa! Please fill out the template below, and remove or add any information as you feel neccesary. ---> This Pull Request removes two dependencies that were not really needed, and fixes #2244 by no longer having the package in the dependency tree. It changes the following: - The `structopt` dependency in `boa_tester` has been replaced by `clap` v3, the same way as we did in `boa_cli`. This means that we have one less dependency (at least), and that `clap` v2 is only used as a dev-dependency by `criterion` (which will probably be removed in 0.4, as per https://github.com/bheisler/criterion.rs/issues/596). - The no-longer-updated `num-format` dependency has been removed from `boa_tester`. We were only using it to add comma thousands separator on results, so I added a simple function to do it (not very performant, but it will only be used a few times when showing results). Looking at this, I noticed a couple of things: - The `csv` dependency, used by `criterion` has not been updated in more than a year, and it's using a very old `itoa` dependency. They updated the dependency in the repository in March, but unfortunately, the release is taking some more time than expected, and a tracking issue can be found here: https://github.com/BurntSushi/rust-csv/issues/271 - `cargo update` fails, because the latest update to `tinystr` in the ICU4x breaks ICU4x 0.6. I have reported this here: https://github.com/unicode-org/icu4x/issues/2428 and their recommendation is for us to use a beta version of the library, but I don't think we should go for that, since this is a semver breakage.
2 years ago
/// Simple function to add commas as thousands separator for integers.
fn pretty_int(i: isize) -> String {
let mut res = String::new();
for (idx, val) in i.abs().to_string().chars().rev().enumerate() {
Removed some non-needed dependencies (#2246) <!--- Thank you for contributing to Boa! Please fill out the template below, and remove or add any information as you feel neccesary. ---> This Pull Request removes two dependencies that were not really needed, and fixes #2244 by no longer having the package in the dependency tree. It changes the following: - The `structopt` dependency in `boa_tester` has been replaced by `clap` v3, the same way as we did in `boa_cli`. This means that we have one less dependency (at least), and that `clap` v2 is only used as a dev-dependency by `criterion` (which will probably be removed in 0.4, as per https://github.com/bheisler/criterion.rs/issues/596). - The no-longer-updated `num-format` dependency has been removed from `boa_tester`. We were only using it to add comma thousands separator on results, so I added a simple function to do it (not very performant, but it will only be used a few times when showing results). Looking at this, I noticed a couple of things: - The `csv` dependency, used by `criterion` has not been updated in more than a year, and it's using a very old `itoa` dependency. They updated the dependency in the repository in March, but unfortunately, the release is taking some more time than expected, and a tracking issue can be found here: https://github.com/BurntSushi/rust-csv/issues/271 - `cargo update` fails, because the latest update to `tinystr` in the ICU4x breaks ICU4x 0.6. I have reported this here: https://github.com/unicode-org/icu4x/issues/2428 and their recommendation is for us to use a beta version of the library, but I don't think we should go for that, since this is a semver breakage.
2 years ago
if idx != 0 && idx % 3 == 0 {
res.insert(0, ',');
}
res.insert(0, val);
}
res
}
/// Generates a proper diff format, with some bold text if things change.
fn diff_format(diff: isize) -> String {
format!(
"{}{}{}{}",
if diff == 0 { "" } else { "**" },
if diff.is_positive() {
"+"
} else if diff.is_negative() {
"-"
} else {
""
},
Removed some non-needed dependencies (#2246) <!--- Thank you for contributing to Boa! Please fill out the template below, and remove or add any information as you feel neccesary. ---> This Pull Request removes two dependencies that were not really needed, and fixes #2244 by no longer having the package in the dependency tree. It changes the following: - The `structopt` dependency in `boa_tester` has been replaced by `clap` v3, the same way as we did in `boa_cli`. This means that we have one less dependency (at least), and that `clap` v2 is only used as a dev-dependency by `criterion` (which will probably be removed in 0.4, as per https://github.com/bheisler/criterion.rs/issues/596). - The no-longer-updated `num-format` dependency has been removed from `boa_tester`. We were only using it to add comma thousands separator on results, so I added a simple function to do it (not very performant, but it will only be used a few times when showing results). Looking at this, I noticed a couple of things: - The `csv` dependency, used by `criterion` has not been updated in more than a year, and it's using a very old `itoa` dependency. They updated the dependency in the repository in March, but unfortunately, the release is taking some more time than expected, and a tracking issue can be found here: https://github.com/BurntSushi/rust-csv/issues/271 - `cargo update` fails, because the latest update to `tinystr` in the ICU4x breaks ICU4x 0.6. I have reported this here: https://github.com/unicode-org/icu4x/issues/2428 and their recommendation is for us to use a beta version of the library, but I don't think we should go for that, since this is a semver breakage.
2 years ago
pretty_int(diff),
if diff == 0 { "" } else { "**" }
)
}
println!("| Test result | main count | PR count | difference |");
println!("| :---------: | :----------: | :------: | :--------: |");
println!(
"| Total | {} | {} | {} |",
Removed some non-needed dependencies (#2246) <!--- Thank you for contributing to Boa! Please fill out the template below, and remove or add any information as you feel neccesary. ---> This Pull Request removes two dependencies that were not really needed, and fixes #2244 by no longer having the package in the dependency tree. It changes the following: - The `structopt` dependency in `boa_tester` has been replaced by `clap` v3, the same way as we did in `boa_cli`. This means that we have one less dependency (at least), and that `clap` v2 is only used as a dev-dependency by `criterion` (which will probably be removed in 0.4, as per https://github.com/bheisler/criterion.rs/issues/596). - The no-longer-updated `num-format` dependency has been removed from `boa_tester`. We were only using it to add comma thousands separator on results, so I added a simple function to do it (not very performant, but it will only be used a few times when showing results). Looking at this, I noticed a couple of things: - The `csv` dependency, used by `criterion` has not been updated in more than a year, and it's using a very old `itoa` dependency. They updated the dependency in the repository in March, but unfortunately, the release is taking some more time than expected, and a tracking issue can be found here: https://github.com/BurntSushi/rust-csv/issues/271 - `cargo update` fails, because the latest update to `tinystr` in the ICU4x breaks ICU4x 0.6. I have reported this here: https://github.com/unicode-org/icu4x/issues/2428 and their recommendation is for us to use a beta version of the library, but I don't think we should go for that, since this is a semver breakage.
2 years ago
pretty_int(base_total),
pretty_int(new_total),
diff_format(total_diff),
);
println!(
"| Passed | {} | {} | {} |",
Removed some non-needed dependencies (#2246) <!--- Thank you for contributing to Boa! Please fill out the template below, and remove or add any information as you feel neccesary. ---> This Pull Request removes two dependencies that were not really needed, and fixes #2244 by no longer having the package in the dependency tree. It changes the following: - The `structopt` dependency in `boa_tester` has been replaced by `clap` v3, the same way as we did in `boa_cli`. This means that we have one less dependency (at least), and that `clap` v2 is only used as a dev-dependency by `criterion` (which will probably be removed in 0.4, as per https://github.com/bheisler/criterion.rs/issues/596). - The no-longer-updated `num-format` dependency has been removed from `boa_tester`. We were only using it to add comma thousands separator on results, so I added a simple function to do it (not very performant, but it will only be used a few times when showing results). Looking at this, I noticed a couple of things: - The `csv` dependency, used by `criterion` has not been updated in more than a year, and it's using a very old `itoa` dependency. They updated the dependency in the repository in March, but unfortunately, the release is taking some more time than expected, and a tracking issue can be found here: https://github.com/BurntSushi/rust-csv/issues/271 - `cargo update` fails, because the latest update to `tinystr` in the ICU4x breaks ICU4x 0.6. I have reported this here: https://github.com/unicode-org/icu4x/issues/2428 and their recommendation is for us to use a beta version of the library, but I don't think we should go for that, since this is a semver breakage.
2 years ago
pretty_int(base_passed),
pretty_int(new_passed),
diff_format(passed_diff),
);
println!(
"| Ignored | {} | {} | {} |",
Removed some non-needed dependencies (#2246) <!--- Thank you for contributing to Boa! Please fill out the template below, and remove or add any information as you feel neccesary. ---> This Pull Request removes two dependencies that were not really needed, and fixes #2244 by no longer having the package in the dependency tree. It changes the following: - The `structopt` dependency in `boa_tester` has been replaced by `clap` v3, the same way as we did in `boa_cli`. This means that we have one less dependency (at least), and that `clap` v2 is only used as a dev-dependency by `criterion` (which will probably be removed in 0.4, as per https://github.com/bheisler/criterion.rs/issues/596). - The no-longer-updated `num-format` dependency has been removed from `boa_tester`. We were only using it to add comma thousands separator on results, so I added a simple function to do it (not very performant, but it will only be used a few times when showing results). Looking at this, I noticed a couple of things: - The `csv` dependency, used by `criterion` has not been updated in more than a year, and it's using a very old `itoa` dependency. They updated the dependency in the repository in March, but unfortunately, the release is taking some more time than expected, and a tracking issue can be found here: https://github.com/BurntSushi/rust-csv/issues/271 - `cargo update` fails, because the latest update to `tinystr` in the ICU4x breaks ICU4x 0.6. I have reported this here: https://github.com/unicode-org/icu4x/issues/2428 and their recommendation is for us to use a beta version of the library, but I don't think we should go for that, since this is a semver breakage.
2 years ago
pretty_int(base_ignored),
pretty_int(new_ignored),
diff_format(ignored_diff),
);
println!(
"| Failed | {} | {} | {} |",
Removed some non-needed dependencies (#2246) <!--- Thank you for contributing to Boa! Please fill out the template below, and remove or add any information as you feel neccesary. ---> This Pull Request removes two dependencies that were not really needed, and fixes #2244 by no longer having the package in the dependency tree. It changes the following: - The `structopt` dependency in `boa_tester` has been replaced by `clap` v3, the same way as we did in `boa_cli`. This means that we have one less dependency (at least), and that `clap` v2 is only used as a dev-dependency by `criterion` (which will probably be removed in 0.4, as per https://github.com/bheisler/criterion.rs/issues/596). - The no-longer-updated `num-format` dependency has been removed from `boa_tester`. We were only using it to add comma thousands separator on results, so I added a simple function to do it (not very performant, but it will only be used a few times when showing results). Looking at this, I noticed a couple of things: - The `csv` dependency, used by `criterion` has not been updated in more than a year, and it's using a very old `itoa` dependency. They updated the dependency in the repository in March, but unfortunately, the release is taking some more time than expected, and a tracking issue can be found here: https://github.com/BurntSushi/rust-csv/issues/271 - `cargo update` fails, because the latest update to `tinystr` in the ICU4x breaks ICU4x 0.6. I have reported this here: https://github.com/unicode-org/icu4x/issues/2428 and their recommendation is for us to use a beta version of the library, but I don't think we should go for that, since this is a semver breakage.
2 years ago
pretty_int(base_failed),
pretty_int(new_failed),
diff_format(failed_diff),
);
println!(
"| Panics | {} | {} | {} |",
Removed some non-needed dependencies (#2246) <!--- Thank you for contributing to Boa! Please fill out the template below, and remove or add any information as you feel neccesary. ---> This Pull Request removes two dependencies that were not really needed, and fixes #2244 by no longer having the package in the dependency tree. It changes the following: - The `structopt` dependency in `boa_tester` has been replaced by `clap` v3, the same way as we did in `boa_cli`. This means that we have one less dependency (at least), and that `clap` v2 is only used as a dev-dependency by `criterion` (which will probably be removed in 0.4, as per https://github.com/bheisler/criterion.rs/issues/596). - The no-longer-updated `num-format` dependency has been removed from `boa_tester`. We were only using it to add comma thousands separator on results, so I added a simple function to do it (not very performant, but it will only be used a few times when showing results). Looking at this, I noticed a couple of things: - The `csv` dependency, used by `criterion` has not been updated in more than a year, and it's using a very old `itoa` dependency. They updated the dependency in the repository in March, but unfortunately, the release is taking some more time than expected, and a tracking issue can be found here: https://github.com/BurntSushi/rust-csv/issues/271 - `cargo update` fails, because the latest update to `tinystr` in the ICU4x breaks ICU4x 0.6. I have reported this here: https://github.com/unicode-org/icu4x/issues/2428 and their recommendation is for us to use a beta version of the library, but I don't think we should go for that, since this is a semver breakage.
2 years ago
pretty_int(base_panics),
pretty_int(new_panics),
diff_format(panic_diff),
);
println!(
"| Conformance | {:.2}% | {:.2}% | {}{}{:.2}%{} |",
base_conformance,
new_conformance,
if conformance_diff.abs() > f64::EPSILON {
"**"
} else {
""
},
if conformance_diff > 0_f64 { "+" } else { "" },
conformance_diff,
if conformance_diff.abs() > f64::EPSILON {
"**"
} else {
""
},
);
if !test_diff.fixed.is_empty() {
println!();
println!(
"<details><summary><b>Fixed tests ({}):</b></summary>",
test_diff.fixed.len()
);
println!("\n```");
for test in test_diff.fixed {
println!("{test}");
}
println!("```");
println!("</details>");
}
if !test_diff.broken.is_empty() {
println!();
println!(
"<details><summary><b>Broken tests ({}):</b></summary>",
test_diff.broken.len()
);
println!("\n```");
for test in test_diff.broken {
println!("{test}");
}
println!("```");
println!("</details>");
}
if !test_diff.new_panics.is_empty() {
println!();
println!(
"<details><summary><b>New panics ({}):</b></summary>",
test_diff.new_panics.len()
);
println!("\n```");
for test in test_diff.new_panics {
println!("{test}");
}
println!("```");
println!("</details>");
}
if !test_diff.panic_fixes.is_empty() {
println!();
println!(
"<details><summary><b>Fixed panics ({}):</b></summary>",
test_diff.panic_fixes.len()
);
println!("\n```");
for test in test_diff.panic_fixes {
println!("{test}");
}
println!("```");
println!("</details>");
}
} else {
println!("Test262 conformance changes:");
println!("| Test result | main | PR | difference |");
println!(
"| Passed | {base_passed:^6} | {new_passed:^5} | {:^10} |",
base_passed - new_passed
);
println!(
"| Ignored | {base_ignored:^6} | {new_ignored:^5} | {:^10} |",
base_ignored - new_ignored
);
println!(
"| Failed | {base_failed:^6} | {new_failed:^5} | {:^10} |",
base_failed - new_failed,
);
println!(
"| Panics | {base_panics:^6} | {new_panics:^5} | {:^10} |",
base_panics - new_panics
);
if !test_diff.fixed.is_empty() {
println!();
println!("Fixed tests ({}):", test_diff.fixed.len());
for test in test_diff.fixed {
println!("{test}");
}
}
if !test_diff.broken.is_empty() {
println!();
println!("Broken tests ({}):", test_diff.broken.len());
for test in test_diff.broken {
println!("{test}");
}
}
if !test_diff.new_panics.is_empty() {
println!();
println!("New panics ({}):", test_diff.new_panics.len());
for test in test_diff.new_panics {
println!("{test}");
}
}
if !test_diff.panic_fixes.is_empty() {
println!();
println!("Fixed panics ({}):", test_diff.panic_fixes.len());
for test in test_diff.panic_fixes {
println!("{test}");
}
}
}
Ok(())
}
/// Test differences.
#[derive(Debug, Clone, Default)]
struct ResultDiff {
fixed: Vec<Box<str>>,
broken: Vec<Box<str>>,
new_panics: Vec<Box<str>>,
panic_fixes: Vec<Box<str>>,
}
impl ResultDiff {
/// Extends the diff with new results.
fn extend(&mut self, new: Self) {
self.fixed.extend(new.fixed);
self.broken.extend(new.broken);
self.new_panics.extend(new.new_panics);
self.panic_fixes.extend(new.panic_fixes);
}
}
/// Compares a base and a new result and returns the list of differences.
fn compute_result_diff(
base: &Path,
base_result: &SuiteResult,
new_result: &SuiteResult,
) -> ResultDiff {
use super::TestOutcomeResult;
let mut final_diff = ResultDiff::default();
for base_test in &base_result.tests {
if let Some(new_test) = new_result
.tests
.iter()
.find(|new_test| new_test.name == base_test.name)
{
let test_name = format!(
"test/{}/{}.js (previously {:?})",
base.display(),
new_test.name,
base_test.result
)
.into_boxed_str();
match (base_test.result, new_test.result) {
(a, b) if a == b => {}
(TestOutcomeResult::Ignored, TestOutcomeResult::Failed) => {}
(_, TestOutcomeResult::Passed) => final_diff.fixed.push(test_name),
(TestOutcomeResult::Panic, _) => final_diff.panic_fixes.push(test_name),
(_, TestOutcomeResult::Failed) => final_diff.broken.push(test_name),
(_, TestOutcomeResult::Panic) => final_diff.new_panics.push(test_name),
_ => {}
}
}
}
for base_suite in &base_result.suites {
if let Some(new_suite) = new_result
.suites
.iter()
.find(|new_suite| new_suite.name == base_suite.name)
{
let new_base = base.join(new_suite.name.as_ref());
let diff = compute_result_diff(new_base.as_path(), base_suite, new_suite);
final_diff.extend(diff);
}
}
final_diff
}