[zorg] r260158 - Use builddir to find where to run tests

[Chris Matthews via llvm-commits]

Author: cmatthews
Date: Mon Feb  8 16:17:54 2016
New Revision: 260158

URL: http://llvm.org/viewvc/llvm-project?rev=260158&view=rev
Log:
Use builddir to find where to run tests

Also, don't print the path.

Modified:
    zorg/trunk/test/jenkins/test_build.py
    zorg/trunk/zorg/jenkins/build.py

Modified: zorg/trunk/test/jenkins/test_build.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/test/jenkins/test_build.py?rev=260158&r1=260157&r2=260158&view=diff
==============================================================================
--- zorg/trunk/test/jenkins/test_build.py (original)
+++ zorg/trunk/test/jenkins/test_build.py Mon Feb  8 16:17:54 2016
@@ -51,7 +51,6 @@
 # CHECK-SIMPLE: '/usr/local/bin/ninja' '-v' 'install'
 # CHECK-SIMPLE: @@@@@@
 # CHECK-SIMPLE: @@@ Tests @@@
-# CHECK-SIMPLE: /usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin
 
 # CHECK-SIMPLE: cd
 # CHECK-SIMPLE: 'env' 'MALLOC_LOG_FILE=/dev/null' '/usr/local/bin/ninja' '-v' 'check-all'

Modified: zorg/trunk/zorg/jenkins/build.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/jenkins/build.py?rev=260158&r1=260157&r2=260158&view=diff
==============================================================================
--- zorg/trunk/zorg/jenkins/build.py (original)
+++ zorg/trunk/zorg/jenkins/build.py Mon Feb  8 16:17:54 2016
@@ -307,15 +307,13 @@ def clang_builder(target):
             # Two stage build, via the make files.
             print 'Stage two compile TBD in near future'
 
-
     if not conf.device and (target == "test" or target == "all"):
         # Add steps to run the tests.
         next_section("Tests")
         # Auto detect bootstrap and non-bootstrap.
-        obj_dir = '/clang.build/Objects/obj-llvm/tools/clang/stage2-bins/'
-        obj_dir = conf.workspace + obj_dir
+        obj_dir = os.path.join(conf._build_dir, 'Objects/obj-llvm/tools/clang/stage2-bins/')
         if not os.path.exists(obj_dir):
-            obj_dir = '/clang.build/Build/'
+            obj_dir = os.path.join(conf._build_dir, 'Build/')
             obj_dir = conf.workspace + obj_dir
 
         cmd = [NINJA, '-v', 'check-all']
@@ -324,7 +322,6 @@ def clang_builder(target):
             cmd[-1] += ' --param use_gmalloc=1 ' \
                 '--param gmalloc_path=$(xcodebuild -find-library' \
                 ' libgmalloc.dylib)'
-        print os.environ.get("PATH", "")
         run_cmd(obj_dir, cmd, env={'MALLOC_LOG_FILE': '/dev/null'})