diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2011-10-26 22:11:23 -0700 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2011-10-26 22:11:23 -0700 |
| commit | 1f9f5f9a820f7251f04127b8ae90e910413759ce (patch) | |
| tree | 73e903e581fb18cde001b44bb0392fd2168f9bb2 | |
| parent | 22fbe176f59f952c91a11e4190340443f4a318a1 (diff) | |
build fixes
| -rw-r--r-- | tests/runner.py | 2 | ||||
| -rw-r--r-- | tools/shared.py | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/tests/runner.py b/tests/runner.py index e266fa81..3fd63574 100644 --- a/tests/runner.py +++ b/tests/runner.py @@ -12,7 +12,7 @@ will use 4 processes. To install nose do something like ''' from subprocess import Popen, PIPE, STDOUT -import os, unittest, tempfile, shutil, time, inspect, sys, math, glob, tempfile, re, json, difflib +import os, unittest, tempfile, shutil, time, inspect, sys, math, glob, tempfile, re, difflib # Setup diff --git a/tools/shared.py b/tools/shared.py index cc6d8f80..38089122 100644 --- a/tools/shared.py +++ b/tools/shared.py @@ -1,4 +1,4 @@ -import shutil, time, os +import shutil, time, os, json from subprocess import Popen, PIPE, STDOUT __rootpath__ = os.path.abspath(os.path.dirname(os.path.dirname(__file__))) @@ -228,9 +228,11 @@ class Building: if type(generated_libs) is not list: generated_libs = [generated_libs] temp_dir = build_dir - project_dir = os.path.join(temp_dir, name) if copy_project: + project_dir = os.path.join(temp_dir, name) shutil.copytree(path_from_root('tests', name), project_dir) # Useful in debugging sometimes to comment this out + else: + project_dir = build_dir try: old_dir = os.getcwd() except: |