From e9343e4bbcb48d513b10002502a5c403dfdeb9b2 Mon Sep 17 00:00:00 2001
From: Pierre Louis Aublin <pierre-louis.aublin@inria.fr>
Date: Sat, 21 Jun 2014 17:26:27 +0200
Subject: [PATCH] taking into account TESTNAME variable in reftest (see #41)

---
 mk/check.mk                         |  4 +-
 src/test/harness/reftest/reftest.rs | 92 +++++++++++++++--------------
 2 files changed, 49 insertions(+), 47 deletions(-)

diff --git a/mk/check.mk b/mk/check.mk
index 0242b7cacef..d294ebc215f 100644
--- a/mk/check.mk
+++ b/mk/check.mk
@@ -82,12 +82,12 @@ check-servo: $(foreach lib_crate,$(SERVO_LIB_CRATES),check-servo-$(lib_crate)) s
 .PHONY: check-ref-cpu
 check-ref-cpu: reftest
 	@$(call E, check: reftests with CPU rendering)
-	$(Q)./reftest $(S)src/test/ref/*.list -- -c
+	$(Q)./reftest $(S)src/test/ref/basic.list $(TESTNAME) -- -c
 
 .PHONY: check-ref-gpu
 check-ref-gpu: reftest
 	@$(call E, check: reftests with GPU rendering)
-	$(Q)./reftest $(S)src/test/ref/*.list
+	$(Q)./reftest $(S)src/test/ref/basic.list $(TESTNAME)
 
 .PHONY: check-ref
 check-ref: check-ref-cpu check-ref-gpu
diff --git a/src/test/harness/reftest/reftest.rs b/src/test/harness/reftest/reftest.rs
index 34da93d3731..8d71349055d 100644
--- a/src/test/harness/reftest/reftest.rs
+++ b/src/test/harness/reftest/reftest.rs
@@ -10,6 +10,7 @@
 extern crate png;
 extern crate std;
 extern crate test;
+extern crate regex;
 
 use std::io;
 use std::io::{File, Reader, Command};
@@ -17,21 +18,24 @@ use std::io::process::ExitStatus;
 use std::os;
 use test::{DynTestName, DynTestFn, TestDesc, TestOpts, TestDescAndFn};
 use test::run_tests_console;
+use regex::Regex;
 
 fn main() {
     let args = os::args();
     let mut parts = args.tail().split(|e| "--" == e.as_slice());
 
-    let files = parts.next().unwrap();  // .split() is never empty
+    let harness_args = parts.next().unwrap();  // .split() is never empty
     let servo_args = parts.next().unwrap_or(&[]);
 
-    if files.len() == 0 {
-        fail!("error: at least one reftest list must be given");
-    }
+    let (manifest, testname) = match harness_args {
+      [] => fail!("error: at least one reftest list must be given"),
+      [ref manifest] => (manifest, None),
+      [ref manifest, ref testname, ..] => (manifest, Some(Regex::new(testname.as_slice()).unwrap())),
+    };
 
-    let tests = parse_lists(files, servo_args);
+    let tests = parse_lists(manifest, servo_args);
     let test_opts = TestOpts {
-        filter: None,
+        filter: testname,
         run_ignored: false,
         logfile: None,
         run_tests: true,
@@ -64,54 +68,52 @@ struct Reftest {
     servo_args: Vec<String>,
 }
 
-fn parse_lists(filenames: &[String], servo_args: &[String]) -> Vec<TestDescAndFn> {
+fn parse_lists(file: &String, servo_args: &[String]) -> Vec<TestDescAndFn> {
     let mut tests = Vec::new();
     let mut next_id = 0;
-    for file in filenames.iter() {
-        let file_path = Path::new(file.clone());
-        let contents = match File::open_mode(&file_path, io::Open, io::Read)
-            .and_then(|mut f| {
-                f.read_to_str()
-            }) {
-                Ok(s) => s,
-                _ => fail!("Could not read file"),
-            };
+    let file_path = Path::new(file.clone());
+    let contents = match File::open_mode(&file_path, io::Open, io::Read)
+       .and_then(|mut f| {
+             f.read_to_str()
+             }) {
+          Ok(s) => s,
+             _ => fail!("Could not read file"),
+       };
 
-        for line in contents.as_slice().lines() {
-            // ignore comments
-            if line.starts_with("#") {
-                continue;
-            }
+    for line in contents.as_slice().lines() {
+       // ignore comments
+       if line.starts_with("#") {
+          continue;
+       }
 
-            let parts: Vec<&str> = line.split(' ').filter(|p| !p.is_empty()).collect();
+       let parts: Vec<&str> = line.split(' ').filter(|p| !p.is_empty()).collect();
 
-            if parts.len() != 3 {
-                fail!("reftest line: '{:s}' doesn't match 'KIND LEFT RIGHT'", line);
-            }
+       if parts.len() != 3 {
+          fail!("reftest line: '{:s}' doesn't match 'KIND LEFT RIGHT'", line);
+       }
 
-            let kind = match parts.get(0) {
-                & "==" => Same,
-                & "!=" => Different,
-                &part => fail!("reftest line: '{:s}' has invalid kind '{:s}'",
-                               line, part)
-            };
-            let src_path = file_path.dir_path();
-            let src_dir = src_path.display().to_str();
-            let file_left =  src_dir.clone().append("/").append(*parts.get(1));
-            let file_right = src_dir.append("/").append(*parts.get(2));
+       let kind = match parts.get(0) {
+          & "==" => Same,
+             & "!=" => Different,
+             &part => fail!("reftest line: '{:s}' has invalid kind '{:s}'",
+                   line, part)
+       };
+       let src_path = file_path.dir_path();
+       let src_dir = src_path.display().to_str();
+       let file_left =  src_dir.clone().append("/").append(*parts.get(1));
+       let file_right = src_dir.append("/").append(*parts.get(2));
 
-            let reftest = Reftest {
-                name: parts.get(1).to_string().append(" / ").append(*parts.get(2)),
-                kind: kind,
-                files: [file_left, file_right],
-                id: next_id,
-                servo_args: servo_args.iter().map(|x| x.clone()).collect(),
-            };
+       let reftest = Reftest {
+name: parts.get(1).to_string().append(" / ").append(*parts.get(2)),
+         kind: kind,
+         files: [file_left, file_right],
+         id: next_id,
+         servo_args: servo_args.iter().map(|x| x.clone()).collect(),
+       };
 
-            next_id += 1;
+       next_id += 1;
 
-            tests.push(make_test(reftest));
-        }
+       tests.push(make_test(reftest));
     }
     tests
 }