From 94b0ecd8500384b201ffa6341772575a7bd5a449 Mon Sep 17 00:00:00 2001
From: Brian Anderson <banderson@mozilla.com>
Date: Tue, 9 Oct 2012 16:23:22 -0700
Subject: [PATCH] Make contenttest build

---
 mk/check.mk                    | 4 ++--
 src/contenttest/contenttest.rs | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/mk/check.mk b/mk/check.mk
index d487cb0dca2..909a1e5b506 100644
--- a/mk/check.mk
+++ b/mk/check.mk
@@ -34,7 +34,7 @@ check-servo: servo-test
 	./servo-test $(TESTNAME)
 
 check-ref: reftest
-	./reftest --source-dir=$(VPATH)/test/ref --work-dir=src/test/ref $(TESTNAME)
+	./reftest --source-dir=$(S)/src/test/ref --work-dir=src/test/ref $(TESTNAME)
 
 check-content: contenttest
-	./contenttest --source-dir=$(VPATH)/test/content $(TESTNAME)
+	./contenttest --source-dir=$(S)/src/test/content $(TESTNAME)
diff --git a/src/contenttest/contenttest.rs b/src/contenttest/contenttest.rs
index 6ffc18a8a05..bec1d2ea160 100644
--- a/src/contenttest/contenttest.rs
+++ b/src/contenttest/contenttest.rs
@@ -9,7 +9,8 @@ struct Config {
     filter: Option<~str>
 }
 
-fn main(args: ~[~str]) {
+fn main() {
+    let args = os::args();
     let config = parse_config(args);
     let opts = test_options(config);
     let tests = find_tests(config);