Merge remote-tracking branch 'upstream/master'

1 files changed, 6 insertions, 2 deletions

diff --git a/tests/runner.py b/tests/runner.py
index 549e4691..88a79c73 100644
--- a/tests/runner.py
+++ b/tests/runner.py
@@ -642,6 +642,10 @@ if 'benchmark' not in sys.argv:
         '''
         self.do_test(src, '*yes*')
 
+        # Test for issue 39
+        if not LLVM_OPTS:
+          self.do_ll_test(path_from_root('tests', 'issue_39.ll'), '*yes*')
+
     def test_if_else(self):
         src = '''
           #include <stdio.h>
@@ -3071,7 +3075,7 @@ else:
         #include<stdlib.h>
         int main() {
           int N = 1024*1024;
-          int M = 600;
+          int M = 190;
           int final = 0;
           char *buf = (char*)malloc(N);
           for (int t = 0; t < M; t++) {
@@ -3085,7 +3089,7 @@ else:
           return 1;
         }      
       '''
-      self.do_benchmark(src, [], 'final: 800.')
+      self.do_benchmark(src, [], 'final: 720.')
 
     def test_fannkuch(self):
       src = open(path_from_root('tests', 'fannkuch.cpp'), 'r').read()