X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=t%2Ftest.py;h=cc61e9986713cfa5929ababf35f6611e69158dc1;hb=3b2c0c783bf7284037f4c5c5ffd6582ee7b1f89c;hp=e736b32fd454fcfde029cc0301bb54d1a8f679dd;hpb=fdf195df30677b8552bb7fedc34f760120268a30;p=moe.git

diff --git a/t/test.py b/t/test.py
index e736b32..cc61e99 100755
--- a/t/test.py
+++ b/t/test.py
@@ -1,29 +1,21 @@
 #!/usr/bin/env python
 
 import sys
-sys.path.append('.')
+#sys.path.append('.')
 
-import moe.meta
-import moe.config
 import moe.eval
-import moe.pipeline
-import moe.batch
-
-overrides = moe.config.parse_overrides(sys.argv)
+import os
 
 e = moe.eval.Eval()
-e.builtins.set("HOME", ".")
-e.builtins.set("TASK", "sum")
-e.builtins.set("CONTESTANT", "mj")
-e.init(overrides)
-
-if len(sys.argv) > 1:
-    file = sys.argv[1]
-else:
-    file = None
-moe.batch.locate(e, file)
-
-e.run()
-
-print "\nFinal meta file:"
-e.meta.write()
+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)