[llvm-commits] [LNT] r167205 - /lnt/trunk/lnt/tests/compile.py

[Michael Gottesman]

Author: mgottesman
Date: Wed Oct 31 21:07:38 2012
New Revision: 167205

URL: http://llvm.org/viewvc/llvm-project?rev=167205&view=rev
Log:
[compile test] Added makefile build type.

Modified:
    lnt/trunk/lnt/tests/compile.py

Modified: lnt/trunk/lnt/tests/compile.py
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/lnt/tests/compile.py?rev=167205&r1=167204&r2=167205&view=diff
==============================================================================
--- lnt/trunk/lnt/tests/compile.py (original)
+++ lnt/trunk/lnt/tests/compile.py Wed Oct 31 21:07:38 2012
@@ -320,6 +320,11 @@
     
     # Form the test build command.
     build_info = project['build_info']
+    
+    # Add arguments to ensure output files go into our build directory.
+    output_base = get_output_path(name)
+    build_base = os.path.join(output_base, 'build')
+    
     if build_info['style'].startswith('xcode-'):
         file_path = os.path.join(source_path, build_info['file'])
         cmd = ['xcodebuild']
@@ -337,9 +342,6 @@
         # Add the build configuration selection.
         cmd.extend(('-configuration', build_config))
 
-        # Add arguments to ensure output files go into our build directory.
-        output_base = get_output_path(name)
-        build_base = os.path.join(output_base, 'build')
         cmd.append('OBJROOT=%s' % (os.path.join(build_base, 'obj')))
         cmd.append('SYMROOT=%s' % (os.path.join(build_base, 'sym')))
         cmd.append('DSTROOT=%s' % (os.path.join(build_base, 'dst')))
@@ -364,6 +366,14 @@
 
         # Add additional arguments to force the build scenario we want.
         cmd.extend(('-jobs', str(num_jobs)))
+    elif build_info['style'] == 'make':
+        
+        target_dir = os.path.dirname(os.path.join(source_path, build_info['file']))
+        cmd = []
+        cmd.extend(['make', '-C', target_dir, build_info['target'], "-j",
+                    str(num_jobs)])
+        env.update(build_info.get('extra_flags', {}))
+        
     else:
         fatal("unknown build style in project: %r" % project)