diff test/testasm.py @ 347:742588fb8cd6 devel

Merge into devel branch
author Windel Bouwman
date Fri, 07 Mar 2014 17:10:21 +0100
parents 3bb7dcfe5529
children 442fb043d149
line wrap: on
line diff
--- a/test/testasm.py	Sat Mar 01 16:27:52 2014 +0100
+++ b/test/testasm.py	Fri Mar 07 17:10:21 2014 +0100
@@ -1,8 +1,7 @@
 #!/usr/bin/python
 
-import unittest, cProfile
+import unittest
 from ppci import CompilerError
-from ppci.asmnodes import AInstruction, ABinop, AUnop, ASymbol, ALabel, ANumber
 from ppci.assembler import tokenize, Assembler, Lexer
 from ppci.objectfile import ObjectFile
 from ppci.linker import Linker
@@ -36,7 +35,7 @@
 
 
 class AssemblerParsingTestCase(unittest.TestCase):
-    """ 
+    """
         Tests the assembler parts
     """
     def setUp(self):
@@ -105,7 +104,7 @@
 class AsmTestCaseBase(unittest.TestCase):
     """ Base testcase for assembly """
     def feed(self, line):
-        self.a.assemble(line)
+        self.a.assemble(line, self.ostream)
 
     def check(self, hexstr):
         l = Linker()