X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=t%2Ftest.py;h=15470ab0afb33e377bfad96d690f68cd1cfd861b;hb=878693c0f1a0a4cee1ae0478e762b4c57dc44df3;hp=005ba39f77ee16455f57e24d40db30a0feb4efbc;hpb=3f526141c46760219dbd8fef09a3ae632e44e574;p=moe.git

diff --git a/t/test.py b/t/test.py
index 005ba39..15470ab 100755
--- a/t/test.py
+++ b/t/test.py
@@ -1,24 +1,26 @@
 #!/usr/bin/env python
 
 import sys
-sys.path.append('.')
+#sys.path.append('.')
 
-import moe.meta
+import moe
 import moe.config
+import moe.log
 import moe.eval
 import moe.pipeline
 import moe.batch
+import os
 
 e = moe.eval.Eval()
-e.builtins.set("HOME", ".")
-e.builtins.set("TASK", "sum")
-e.builtins.set("CONTESTANT", "somebody")
-e.init()
-
-print "Task configuration:"
-e.cfgs.dump()
-print
-
-moe.batch.locate(e)
-
-e.run()
+try:
+    e.init(['TASK = "sum"; CONTESTANT = "mj"; SOURCE = "som_sol.c"; VERBOSE = "2"'] + sys.argv[1:])
+    e.log.debug("### Evaluating task %s of contestant %s ###\n\n" % (e['TASK'], e['CONTESTANT']))
+    try:
+	e.run()
+    except moe.SolutionError, err: # Why are we catching this?
+	e.status["error"] = err
+	e.log.user.error(err)
+	e.log.exception()
+except:
+    e.log.exception("Moe fatal error")
+    sys.exit(1)