Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4)

Unified Diff: native_client_sdk/src/build_tools/build_sdk.py

Issue 10824092: [NaCl SDK] Build gtest on buildbots, but don't include it in the SDK. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: changes so i can land Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | native_client_sdk/src/build_tools/generate_make.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: native_client_sdk/src/build_tools/build_sdk.py
diff --git a/native_client_sdk/src/build_tools/build_sdk.py b/native_client_sdk/src/build_tools/build_sdk.py
index 0b2ba949782c9cdde297a45703f94694e10ac498..437fdaf80259c32713db07891b7157bb45877e2b 100755
--- a/native_client_sdk/src/build_tools/build_sdk.py
+++ b/native_client_sdk/src/build_tools/build_sdk.py
@@ -532,9 +532,9 @@ def GetWindowsEnvironment():
return dict(line.split('=') for line in stdout.split('\r\n')[:-1])
-def BuildStepBuildLibraries(pepperdir, platform):
+def BuildStepBuildLibraries(pepperdir, platform, directory):
buildbot_common.BuildStep('Build Libraries')
- src_dir = os.path.join(pepperdir, 'src')
+ src_dir = os.path.join(pepperdir, directory)
makefile = os.path.join(src_dir, 'Makefile')
if os.path.isfile(makefile):
print "\n\nMake: " + src_dir
@@ -630,6 +630,38 @@ def BuildStepBuildExamples(pepperdir, platform):
buildbot_common.Run(['make', '-j8'],
cwd=os.path.abspath(example_dir), shell=True, env=env)
+TEST_EXAMPLE_LIST = [
+]
+
+TEST_LIBRARY_LIST = [
+ 'gtest',
+]
+
+def BuildStepCopyTests(pepperdir, toolchains, build_experimental):
+ buildbot_common.BuildStep('Copy Tests')
+
+ testingdir = os.path.join(pepperdir, 'testing')
+ buildbot_common.RemoveDir(testingdir)
+ buildbot_common.MakeDir(testingdir)
+
+ args = ['--dstroot=%s' % pepperdir, '--master']
+ for toolchain in toolchains:
+ args.append('--' + toolchain)
+
+ for example in TEST_EXAMPLE_LIST:
+ dsc = os.path.join(SDK_EXAMPLE_DIR, example, 'example.dsc')
+ args.append(dsc)
+
+ for library in TEST_LIBRARY_LIST:
+ dsc = os.path.join(SDK_LIBRARY_DIR, library, 'library.dsc')
+ args.append(dsc)
+
+ if build_experimental:
+ args.append('--experimental')
+
+ if generate_make.main(args):
+ buildbot_common.ErrorExit('Failed to build tests.')
+
def BuildStepTestExamples(pepperdir, platform, pepper_ver):
buildbot_common.BuildStep('Test Examples')
@@ -756,8 +788,10 @@ def main(args):
if options.only_examples:
BuildStepCopyExamples(pepperdir, toolchains, options.build_experimental)
- BuildStepBuildLibraries(pepperdir, platform)
+ BuildStepBuildLibraries(pepperdir, platform, 'src')
BuildStepBuildExamples(pepperdir, platform)
+ BuildStepCopyTests(pepperdir, toolchains, options.build_experimental)
+ BuildStepBuildLibraries(pepperdir, platform, 'testing')
if options.test_examples:
BuildStepTestExamples(pepperdir, platform, pepper_ver)
elif options.only_updater:
@@ -776,7 +810,7 @@ def main(args):
BuildStepCopyExamples(pepperdir, toolchains, options.build_experimental)
# Ship with libraries prebuilt, so run that first.
- BuildStepBuildLibraries(pepperdir, platform)
+ BuildStepBuildLibraries(pepperdir, platform, 'src')
if not options.skip_tar:
BuildStepTarBundle(pepper_ver, tarfile)
@@ -786,6 +820,8 @@ def main(args):
# the examples and test from this directory instead of the original.
pepperdir = BuildStepTestUpdater(platform, pepper_ver, clnumber, tarfile)
BuildStepBuildExamples(pepperdir, platform)
+ BuildStepCopyTests(pepperdir, toolchains, options.build_experimental)
+ BuildStepBuildLibraries(pepperdir, platform, 'testing')
if options.test_examples:
BuildStepTestExamples(pepperdir, platform, pepper_ver)
« no previous file with comments | « no previous file | native_client_sdk/src/build_tools/generate_make.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698