merge

2 files changed, 7 insertions, 2 deletions

diff --git a/example/asm_armt.py b/example/asm_armt.py
index ccbdad3a..432d4101 100644
--- a/example/asm_armt.py
+++ b/example/asm_armt.py
@@ -62,7 +62,7 @@ for b in blocs[0]:
 g = asmbloc.bloc2graph(blocs[0])
 open("graph.txt", "w").write(g)
 
-s = StrPatchwork(open('libandroid_runtime.so').read())
+s = StrPatchwork()
 
 print "symbols"
 print symbol_pool
diff --git a/test/test_all.py b/test/test_all.py
index 848c0c66..11ea1c3a 100644
--- a/test/test_all.py
+++ b/test/test_all.py
@@ -329,6 +329,7 @@ def run_test(test, coveragerc=None):
         write_colored("ERROR", "red", len(s))
         print outputs[1]
 
+    return testpy.returncode
 
 def run_test_parallel(test, current, global_state):
 
@@ -437,10 +438,14 @@ if llvm is False:
 
 if multiproc is False:
     done = list()
+    status = 0
     for test in test_iter(done):
-        run_test(test, coveragerc=coveragerc)
+        status |= run_test(test, coveragerc=coveragerc)
         done.append(test)
 
+    # Return an error code if a test failed
+    assert(status == 0)
+
 else:
     # Parallel version
     cpu_c = cpu_count()