T0b1/wasmtime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Handle write errors in the build script.

Browse Source
This commit is contained in:
Dan Gohman
2018-12-03 15:08:18 -08:00
parent c3dd82b0d5
commit 974355e20b
1 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
lib/wast/build.rs
View File

@@ -1,6 +1,6 @@
use std::env; use std::env;
use std::fs::{read_dir, File}; use std::fs::{read_dir, File};
use std::io::Write; use std::io::{self, Write};
use std::path::PathBuf; use std::path::PathBuf;
fn main() { fn main() {
@@ -9,11 +9,11 @@ fn main() {
let mut out = let mut out =
File::create(out_dir.join("run_wast_files.rs")).expect("error creating run_wast_files.rs"); File::create(out_dir.join("run_wast_files.rs")).expect("error creating run_wast_files.rs");
test_directory(&mut out, "misc_testsuite"); test_directory(&mut out, "misc_testsuite").unwrap();
test_directory(&mut out, "spec_testsuite"); test_directory(&mut out, "spec_testsuite").unwrap();
} }
fn test_directory(out: &mut File, testsuite: &str) { fn test_directory(out: &mut File, testsuite: &str) -> io::Result<()> {
let mut dir_entries: Vec<_> = read_dir(testsuite) let mut dir_entries: Vec<_> = read_dir(testsuite)
.unwrap() .unwrap()
.map(|r| r.unwrap()) .map(|r| r.unwrap())
@@ -37,8 +37,8 @@ fn test_directory(out: &mut File, testsuite: &str) {
dir_entries.sort_by_key(|dir| dir.path()); dir_entries.sort_by_key(|dir| dir.path());
writeln!(out, "mod {} {{", testsuite); writeln!(out, "mod {} {{", testsuite)?;
writeln!(out, " use super::{{native_isa, wast_file, Path}};"); writeln!(out, " use super::{{native_isa, wast_file, Path}};")?;
for dir_entry in dir_entries { for dir_entry in dir_entries {
let path = dir_entry.path(); let path = dir_entry.path();
let stemstr = path let stemstr = path
@@ -47,25 +47,26 @@ fn test_directory(out: &mut File, testsuite: &str) {
.to_str() .to_str()
.expect("to_str"); .expect("to_str");
writeln!(out, " #[test]"); writeln!(out, " #[test]")?;
if ignore(testsuite, stemstr) { if ignore(testsuite, stemstr) {
writeln!(out, " #[ignore]"); writeln!(out, " #[ignore]")?;
} }
writeln!( writeln!(
out, out,
" fn {}() {{", " fn {}() {{",
avoid_keywords(&stemstr.replace("-", "_")) avoid_keywords(&stemstr.replace("-", "_"))
); )?;
writeln!( writeln!(
out, out,
" wast_file(Path::new(\"{}\"), &*native_isa()).expect(\"error loading wast file {}\");", " wast_file(Path::new(\"{}\"), &*native_isa()).expect(\"error loading wast file {}\");",
path.display(), path.display(),
path.display() path.display()
); )?;
writeln!(out, " }}"); writeln!(out, " }}")?;
writeln!(out); writeln!(out)?;
} }
writeln!(out, "}}"); writeln!(out, "}}")?;
Ok(())
} }
fn avoid_keywords(name: &str) -> &str { fn avoid_keywords(name: &str) -> &str {