From 750dcc05e441e9e958012155902ce841e1ef1ed2 Mon Sep 17 00:00:00 2001
From: Graydon Hoare <graydon@mozilla.com>
Date: Wed, 29 Jun 2011 09:13:48 -0700
Subject: [PATCH] Make tests a little more friendly to combine.

---
 src/test/run-pass/alt-path.rs                | 2 +-
 src/test/run-pass/export-non-interference.rs | 1 +
 src/test/run-pass/import.rs                  | 4 +++-
 src/test/run-pass/import2.rs                 | 2 +-
 src/test/run-pass/import3.rs                 | 2 +-
 src/test/run-pass/import6.rs                 | 2 +-
 6 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/test/run-pass/alt-path.rs b/src/test/run-pass/alt-path.rs
index 593e79864bac..f6d4b0f7fd3d 100644
--- a/src/test/run-pass/alt-path.rs
+++ b/src/test/run-pass/alt-path.rs
@@ -6,4 +6,4 @@ mod m1 {
 
 fn bar(m1::foo x) { alt (x) { case (m1::foo1) { } } }
 
-fn main(vec[str] args) { }
\ No newline at end of file
+fn main() { }
\ No newline at end of file
diff --git a/src/test/run-pass/export-non-interference.rs b/src/test/run-pass/export-non-interference.rs
index 799bb69bf8b8..e8d52831a246 100644
--- a/src/test/run-pass/export-non-interference.rs
+++ b/src/test/run-pass/export-non-interference.rs
@@ -1,5 +1,6 @@
 
 export foo;
+export main;
 
 tag list_cell[T] { cons(@list_cell[T]); }
 
diff --git a/src/test/run-pass/import.rs b/src/test/run-pass/import.rs
index 2bccd392a33a..f434bcf04010 100644
--- a/src/test/run-pass/import.rs
+++ b/src/test/run-pass/import.rs
@@ -7,8 +7,10 @@ mod foo {
 mod bar {
   import foo::x;
   import z = foo::x;
-  fn main() {
+  fn thing() {
     x(10);
     z(10);
   }
 }
+
+fn main() { bar::thing(); }
\ No newline at end of file
diff --git a/src/test/run-pass/import2.rs b/src/test/run-pass/import2.rs
index 46d9980417a0..f8810e1bf4a9 100644
--- a/src/test/run-pass/import2.rs
+++ b/src/test/run-pass/import2.rs
@@ -5,4 +5,4 @@ mod zed {
     fn bar() { log "bar"; }
 }
 
-fn main(vec[str] args) { bar(); }
\ No newline at end of file
+fn main() { bar(); }
\ No newline at end of file
diff --git a/src/test/run-pass/import3.rs b/src/test/run-pass/import3.rs
index 1ee63558fd54..687074d55bef 100644
--- a/src/test/run-pass/import3.rs
+++ b/src/test/run-pass/import3.rs
@@ -8,4 +8,4 @@ mod baz {
     }
 }
 
-fn main(vec[str] args) { bar(); }
\ No newline at end of file
+fn main() { bar(); }
\ No newline at end of file
diff --git a/src/test/run-pass/import6.rs b/src/test/run-pass/import6.rs
index d4b82f41ba54..5c56b69bc2d4 100644
--- a/src/test/run-pass/import6.rs
+++ b/src/test/run-pass/import6.rs
@@ -11,6 +11,6 @@ mod bar {
   import zed::baz;
   export baz;
 }
-fn main(vec[str] args) {
+fn main() {
   baz();
 }