diff --git a/LICENSE-APACHE b/LICENSE-APACHE new file mode 100644 index 0000000..16fe87b --- /dev/null +++ b/LICENSE-APACHE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + +Copyright [yyyy] [name of copyright owner] + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. diff --git a/LICENSE-MIT b/LICENSE-MIT new file mode 100644 index 0000000..fa2904d --- /dev/null +++ b/LICENSE-MIT @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) 2017-2020 tsclientlib contributors + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/README.md b/README.md new file mode 100644 index 0000000..fd03277 --- /dev/null +++ b/README.md @@ -0,0 +1,52 @@ +# Deqp Runer +Run the Vulkan Conformance Test Suite in parallel and robustly. + +This is fork/rewrite of the mesa [parallel deqp runner](https://gitlab.freedesktop.org/mesa/parallel-deqp-runner). + +## Features + +- Run tests in parallel +- Recover from crashes (e.g. failing asserts) +- Recover from timeouts +- Save results even on fatal errors +- Cross-platform +- Automatically retry failing tests +- Automatically bisect failures if they depend on a combination of tests +- Save a junit compatible xml file of the results + +## Usage +Create a `testlist.txt` with one deqp test name per line. Run with +```bash +deqp-runner -t testlist.txt -- ./deqp-vk --deqp-caselist-file +``` + +A more complicated command: +```bash +deqp-runner -t testlist.txt \ + --timeout 10 \ + --jobs 2 \ + --shuffle \ + --no-progress \ + --start 50 \ + -- ./deqp-vk \ + --deqp-log-flush=disable \ + --deqp-log-images=disable \ + --deqp-log-shader-sources=disable \ + --deqp-surface-width=256 \ + --deqp-surface-height=256 \ + --deqp-surface-type=pbuffer \ + --deqp-gl-config-name=rgba8888d24s8ms0 \ + --deqp-caselist-file +``` + +## Build +Install [Rust](https://rust-lang.org) (preferred installation method is [rustup](https://rustup.rs)) +and build with `cargo build --release`. + +## License +Licensed under either of + + * [Apache License, Version 2.0](LICENSE-APACHE) + * [MIT license](LICENSE-MIT) + +at your option. diff --git a/src/lib.rs b/src/lib.rs index 198c0ec..4ad5070 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -104,7 +104,7 @@ pub struct Options { /// Timout for a single test in seconds. /// /// A test that runs this long is considered failing. - #[cfg_attr(feature = "bin", clap(long, default_value = "60"))] + #[cfg_attr(feature = "bin", clap(long, default_value = "600"))] pub timeout: u32, /// The deqp command to run. E.g. `./deqp-vk --deqp-caselist-file` /// @@ -470,6 +470,7 @@ impl RunDeqpState { }; if let Some(l) = l { if l.contains("FATAL ERROR: ") { + warn!(self.logger, "Deqp encountered fatal error"; "error" => &l); self.has_fatal_error = true; } self.stderr.push_str(&l); diff --git a/src/main.rs b/src/main.rs index d4f44c4..373a4e8 100644 --- a/src/main.rs +++ b/src/main.rs @@ -20,6 +20,10 @@ async fn real_main() -> Result<()> { std::env::set_var("RUST_LOG", "info"); } + if PROGRESS_BAR.is_hidden() { + options.no_progress = true; + } + let logger = if !options.no_progress { let drain = slog_term::FullFormat::new(deqp_runner::slog_pg::ProgressBarDecorator) .build() diff --git a/src/summary.rs b/src/summary.rs index b407f6f..da00bf1 100644 --- a/src/summary.rs +++ b/src/summary.rs @@ -74,89 +74,101 @@ pub fn write_summary<'a>( use junit_report::TestCase; // Write only failures - let ts = junit_report::TestSuite::new("CTS").add_testcases(tests.iter().filter_map(|t| { - if let Some(entry) = summary.0.get(t) { - if entry.0.result.is_failure() || matches!(entry.0.result, TestResultType::Flake(_)) - { - // Count flakes as success but report anyway - if let Some(run) = &entry.1 { - let mut test = if let TestResultType::Flake(res) = &entry.0.result { - TestCase::success( - t, - junit_report::Duration::from_std(run.duration.try_into().unwrap()) + let mut has_not_run = 0; + let mut ts = + junit_report::TestSuite::new("CTS").add_testcases(tests.iter().filter_map(|t| { + if let Some(entry) = summary.0.get(t) { + if entry.0.result.is_failure() + || matches!(entry.0.result, TestResultType::Flake(_)) + { + // Count flakes as success but report anyway + if let Some(run) = &entry.1 { + let mut test = if let TestResultType::Flake(res) = &entry.0.result { + TestCase::success( + t, + junit_report::Duration::from_std( + run.duration.try_into().unwrap(), + ) .unwrap(), - ) - .set_system_out(&format!("{}\nFlake({:?})", run.result.stdout, res)) - } else { - TestCase::failure( - t, - junit_report::Duration::from_std(run.duration.try_into().unwrap()) + ) + .set_system_out(&format!("{}\nFlake({:?})", run.result.stdout, res)) + } else { + TestCase::failure( + t, + junit_report::Duration::from_std( + run.duration.try_into().unwrap(), + ) .unwrap(), - &format!("{:?}", entry.0.result), - "", - ) - .set_system_out(&run.result.stdout) - }; + &format!("{:?}", entry.0.result), + "", + ) + .set_system_out(&run.result.stdout) + }; - // Read stderr from failure dir - if let (Some(fail_dir), Some(run_dir)) = (fail_dir, &run.fail_dir) { - let path = fail_dir.join(run_dir).join(crate::STDERR_FILE); - match File::open(&path) { - Ok(f) => { - let mut last_lines = - VecDeque::with_capacity(crate::LAST_STDERR_LINES); - for l in BufReader::new(f).lines() { - let l = match l { - Ok(l) => l, - Err(e) => { - warn!(logger, "Failed to read stderr file"; + // Read stderr from failure dir + if let (Some(fail_dir), Some(run_dir)) = (fail_dir, &run.fail_dir) { + let path = fail_dir.join(run_dir).join(crate::STDERR_FILE); + match File::open(&path) { + Ok(f) => { + let mut last_lines = + VecDeque::with_capacity(crate::LAST_STDERR_LINES); + for l in BufReader::new(f).lines() { + let l = match l { + Ok(l) => l, + Err(e) => { + warn!(logger, "Failed to read stderr file"; "path" => ?path, "error" => %e); - break; + break; + } + }; + if last_lines.len() >= crate::LAST_STDERR_LINES { + last_lines.pop_front(); } - }; - if last_lines.len() >= crate::LAST_STDERR_LINES { - last_lines.pop_front(); + last_lines.push_back(l); } - last_lines.push_back(l); - } - let mut last_lines_str = String::new(); - for l in last_lines { - if !last_lines_str.is_empty() { - last_lines_str.push('\n'); + let mut last_lines_str = String::new(); + for l in last_lines { + if !last_lines_str.is_empty() { + last_lines_str.push('\n'); + } + last_lines_str.push_str(&l); } - last_lines_str.push_str(&l); + test = test.set_system_err(&last_lines_str); } - test = test.set_system_err(&last_lines_str); - } - Err(e) => { - warn!(logger, "Failed to open stderr file"; "path" => ?path, + Err(e) => { + warn!(logger, "Failed to open stderr file"; "path" => ?path, "error" => %e); + } } } - } - Some(test) + Some(test) + } else { + Some(TestCase::failure( + t, + junit_report::Duration::seconds(0), + &format!("{:?}", entry.0.result), + "", + )) + } } else { - Some(TestCase::failure( - t, - junit_report::Duration::seconds(0), - &format!("{:?}", entry.0.result), - "", - )) + None } } else { + has_not_run += 1; None } - } else { - Some(TestCase::error( - t, - junit_report::Duration::seconds(0), - "NotRun", - "", - )) - } - })); + })); + + if has_not_run > 0 { + ts = ts.add_testcase(TestCase::error( + "", + junit_report::Duration::seconds(0), + "NotRun", + &format!("{} test cases were not run", has_not_run), + )); + } let r = junit_report::Report::new().add_testsuite(ts); let mut file = std::fs::File::create(file).map_err(WriteSummaryError::OpenFile)?;