about summary refs log tree commit diff
path: root/src/compiletest/compiletest.rc
diff options
context:
space:
mode:
Diffstat (limited to 'src/compiletest/compiletest.rc')
-rw-r--r--src/compiletest/compiletest.rc15
1 files changed, 8 insertions, 7 deletions
diff --git a/src/compiletest/compiletest.rc b/src/compiletest/compiletest.rc
index 8f5f9547c52..b63ac5e75a2 100644
--- a/src/compiletest/compiletest.rc
+++ b/src/compiletest/compiletest.rc
@@ -159,7 +159,7 @@ pub fn test_opts(config: config) -> test::TestOpts {
     }
 }
 
-pub fn make_tests(config: config) -> ~[test::TestDesc] {
+pub fn make_tests(config: config) -> ~[test::TestDescAndFn] {
     debug!("making tests from %s",
            config.src_base.to_str());
     let mut tests = ~[];
@@ -196,13 +196,14 @@ pub fn is_test(config: config, testfile: &Path) -> bool {
     return valid;
 }
 
-pub fn make_test(config: config, testfile: &Path) ->
-   test::TestDesc {
-    test::TestDesc {
-        name: make_test_name(config, testfile),
+pub fn make_test(config: config, testfile: &Path) -> test::TestDescAndFn {
+    test::TestDescAndFn {
+        desc: test::TestDesc {
+            name: make_test_name(config, testfile),
+            ignore: header::is_test_ignored(config, testfile),
+            should_fail: false
+        },
         testfn: make_test_closure(config, testfile),
-        ignore: header::is_test_ignored(config, testfile),
-        should_fail: false
     }
 }