passing erroneous tests.

Author: droptablestar

java_sk/encoder.py

@@ -53,12 +53,12 @@ def __init__(self, program):
     def find_main(self):
         mtds = []
         for c in self.clss:
-            mtds = utils.extract_nodes([MethodDeclaration, ConstructorDeclaration], c)
-            mtds = filter(lambda m: td.isStatic(m) and m.name == u'main', mtds)
-            lenn = len(mtds)
-            if lenn > 1:
-                raise Exception("multiple main()s", mtds)
-                return mtds[0] if lenn == 1 else None
+            m = utils.extract_nodes([MethodDeclaration, ConstructorDeclaration], c)
+            mtds.extend(filter(lambda m: td.isStatic(m) and m.name == u'main', m))
+        lenn = len(mtds)
+        if lenn > 1:
+            raise Exception("multiple main()s", map(lambda m: m.parentNode.name, mtds))
+            return mtds[0] if lenn == 1 else None
 
     def find_harness(self):
         # TODO: these can also be specified with annotations -- we don't support those yet
@@ -74,7 +74,7 @@ def main_cls(self):
         harness = self.prg.gsymtab[harness.atr] if harness else None
         if main: return main
         elif harness: return harness
-        else: raise Exception("No main(), @Harness, or harness found")
+        else: raise Exception("No main(), @Harness, or harness found, None")
 
     def to_sk(self):
         # clean up result directory

jsk.sh

@@ -1,18 +1,3 @@
 #!/bin/bash
 
-if [[ $1 == "-test" ]]
-then
-    wd=`pwd`
-    if [ ! -d $wd/tmp ]; then mkdir -p $wd/tmp
-    else rm $wd/tmp/*
-    fi
-
-    shift
-    in=$1
-    shift
-    python -m java_sk.main -o result/tmp $wd/$in
-    
-    diff -Bwr result/tmp results/output
-else
-    python -m java_sk.main -o result $@
-fi
+python -m java_sk.main -o result $@