X-Git-Url: https://code.kerkeslager.com/?p=fur;a=blobdiff_plain;f=integration_tests.py;h=7cc6d1a490edf6e2ce6a8b9219a8be40aa750d7c;hp=8a5b8f356359ff41cbf17f69a8029ec35467ccd9;hb=refs%2Fheads%2Fmaster;hpb=8b306504c3a04a4334d3e8de6abed6c3ce182585

diff --git a/integration_tests.py b/integration_tests.py
index 8a5b8f3..7cc6d1a 100644
--- a/integration_tests.py
+++ b/integration_tests.py
@@ -6,14 +6,53 @@ import unittest
 # Go to the directory of the current file so we know where we are in the filesystem
 os.chdir(os.path.dirname(os.path.abspath(__file__)))
 
-class OutputTests(unittest.TestCase):
+class InterpreterOutputTests(unittest.TestCase):
     pass
 
-def add_example_output_test(filename):
+def add_example_interpreter_output_test(filename):
+    def test(self):
+        p = subprocess.Popen(
+            (
+                'python',
+                'main.py',
+                'interpret',
+                os.path.join('examples', filename),
+            ),
+            stdout=subprocess.PIPE,
+            stderr=subprocess.PIPE,
+        )
+
+        actual_stdout, actual_stderr = p.communicate()
+
+        expected_stdout_path = os.path.join('examples', filename + '.stdout.txt')
+
+        if os.path.isfile(expected_stdout_path):
+            with open(expected_stdout_path, 'rb') as f:
+                expected_stdout = f.read()
+        else:
+            expected_stdout = b''
+
+        expected_stderr_path = os.path.join('examples', filename + '.stderr.txt')
+
+        if os.path.isfile(expected_stderr_path):
+            with open(expected_stderr_path, 'rb') as f:
+                expected_stderr = f.read()
+        else:
+            expected_stderr = b''
+
+        self.assertEqual(expected_stderr, actual_stderr)
+
+    setattr(InterpreterOutputTests, 'test_' + filename[:-4], test)
+
+class CompilerOutputTests(unittest.TestCase):
+    pass
+
+def add_example_compiler_output_test(filename):
     def test(self):
         compile_fur_to_c_result = subprocess.call([
             'python',
             'main.py',
+            'compile',
             os.path.join('examples', filename),
         ])
 
@@ -29,12 +68,26 @@ def add_example_output_test(filename):
             raise Exception('Example output "{}" did not compile'.format(filename + '.c'))
 
         try:
-            actual_output = subprocess.check_output(['./a.out'])
+            p = subprocess.Popen('./a.out', stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+            actual_stdout, actual_stderr = p.communicate()
+
+            expected_stdout_path = os.path.join('examples', filename + '.stdout.txt')
+
+            if os.path.isfile(expected_stdout_path):
+                with open(expected_stdout_path, 'rb') as f:
+                    expected_stdout = f.read()
+            else:
+                expected_stdout = b''
+
+            expected_stderr_path = os.path.join('examples', filename + '.stderr.txt')
 
-            with open(os.path.join('examples', filename + '.output.txt'), 'rb') as f:
-                expected_output = f.read()
+            if os.path.isfile(expected_stderr_path):
+                with open(expected_stderr_path, 'rb') as f:
+                    expected_stderr = f.read()
+            else:
+                expected_stderr = b''
 
-            self.assertEqual(expected_output, actual_output)
+            self.assertEqual(expected_stderr, actual_stderr)
 
             # We don't clean up the C file in the finally clause because it can be useful to have in case of errors
             os.remove(os.path.join('examples', filename + '.c'))
@@ -45,9 +98,9 @@ def add_example_output_test(filename):
             except OSError:
                 pass
 
-    setattr(OutputTests, 'test_' + filename, test)
+    setattr(CompilerOutputTests, 'test_' + filename[:-4], test)
 
-class MemoryLeakTest(unittest.TestCase):
+class MemoryLeakTests(unittest.TestCase):
     pass
 
 def add_example_memory_leak_test(filename):
@@ -81,7 +134,7 @@ def add_example_memory_leak_test(filename):
                         '--show-reachable=yes',
                         '--num-callers=20',
                         '--track-fds=yes',
-                        '--error-exitcode=666',
+                        '--error-exitcode=42',
                         '-q',
                         './a.out',
                     ],
@@ -100,7 +153,7 @@ def add_example_memory_leak_test(filename):
             except OSError:
                 pass
 
-    setattr(MemoryLeakTest, 'test_' + filename, test)
+    setattr(MemoryLeakTests, 'test_' + filename[:-4], test)
 
 filenames = (
     entry.name
@@ -110,7 +163,8 @@ filenames = (
 )
 
 for filename in filenames:
-    add_example_output_test(filename)
+    add_example_compiler_output_test(filename)
+    add_example_interpreter_output_test(filename)
     add_example_memory_leak_test(filename)
 
 unittest.main()