Convert the CFG traversal tests to file tests.

Add a "cfg_postorder:" printout to the "test domtree" file tests and use
that to check the computed CFG post-order instead of doing it manually
with Rust code.

cranelift/src/filetest/domtree.rs

@@ -15,9 +15,11 @@ use cretonne::flowgraph::ControlFlowGraph;
 use cretonne::ir::Function;
 use cretonne::ir::entities::AnyEntity;
 use cton_reader::TestCommand;
-use filetest::subtest::{SubTest, Context, Result};
+use filetest::subtest::{SubTest, Context, Result, run_filecheck};
 use std::borrow::{Borrow, Cow};
 use std::collections::HashMap;
+use std::fmt::{self, Write};
+use std::result;
 use utils::match_directive;
 
 struct TestDomtree;
@@ -108,6 +110,20 @@ impl SubTest for TestDomtree {
             }
         }
 
-        Ok(())
+        let text = filecheck_text(&domtree).expect("formatting error");
+        run_filecheck(&text, context)
     }
 }
+
+// Generate some output for filecheck testing
+fn filecheck_text(domtree: &DominatorTree) -> result::Result<String, fmt::Error> {
+    let mut s = String::new();
+
+    write!(s, "cfg_postorder:")?;
+    for &ebb in domtree.cfg_postorder() {
+        write!(s, " {}", ebb)?;
+    }
+    writeln!(s, "")?;
+
+    Ok(s)
+}

cranelift/src/print_cfg.rs

@@ -46,7 +46,7 @@ impl<'a> CFGPrinter<'a> {
     }
 
     fn header(&self, w: &mut Write) -> Result {
-        writeln!(w, "digraph {} {{", self.func.name)?;
+        writeln!(w, "digraph \"{}\" {{", self.func.name)?;
         if let Some(entry) = self.func.layout.entry_block() {
             writeln!(w, "    {{rank=min; {}}}", entry)?;
         }