Index: build/run_tests.py |
diff --git a/build/run_tests.py b/build/run_tests.py |
index 5f3e971d2dbae16e30650b9438bac6b7b59554a6..ec9845c1028b6a8ad0127327486ceafe289a0b0e 100755 |
--- a/build/run_tests.py |
+++ b/build/run_tests.py |
@@ -18,9 +18,6 @@ import os |
import subprocess |
import sys |
-script_dir = os.path.dirname(__file__) |
-crashpad_dir = os.path.dirname(script_dir) if script_dir is not '' else '..' |
- |
# This script is primarily used from the waterfall so that the list of tests |
# that are run is maintained in-tree, rather than in a separate infrastructure |
@@ -29,7 +26,13 @@ def main(args): |
if len(args) != 1: |
print >>sys.stderr, 'usage: run_tests.py {Debug|Release}' |
return 1; |
- binary_dir = os.path.join(crashpad_dir, 'out', args[0]) |
+ |
+ # Until https://code.google.com/p/crashpad/issues/detail?id=4 is fixed, tests |
+ # need to be run from a specific working directory. |
+ crashpad_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) |
scottmg
2014/12/12 21:52:51
dirname(dirname(...)) is strange, maybe join(dirna
|
+ os.chdir(crashpad_dir) |
+ |
+ binary_dir = os.path.join('out', args[0]) |
tests = [ |
'client_test', |
'minidump_test', |