← Back to branch summary

~evarlast/ubuntu/utopic/mongodb/upstart-workaround-debian-bug-718702

« back to all changes in this revision

Viewing changes to site_scons/site_tools/unittest.py

  • Committer: Package Import Robot
  • Author(s): James Page, James Page, Robie Basak
  • Date: 2013-05-29 17:44:42 UTC
  • mfrom: (44.1.7 sid)
  • Revision ID: package-import@ubuntu.com-20130529174442-z0a4qmoww4y0t458
Tags: 1:2.4.3-1ubuntu1
[ James Page ]
* Merge from Debian unstable, remaining changes:
  - Enable SSL support:
    + d/control: Add libssl-dev to BD's.
    + d/rules: Enabled --ssl option.
    + d/mongodb.conf: Add example SSL configuration options.
  - d/mongodb-server.mongodb.upstart: Add upstart configuration.
  - d/rules: Don't strip binaries during scons build for Ubuntu.
  - d/control: Add armhf to target archs.
  - d/p/SConscript.client.patch: fixup install of client libraries.
  - d/p/0010-install-libs-to-usr-lib-not-usr-lib64-Closes-588557.patch:
    Install libraries to lib not lib64.
* Dropped changes:
  - d/p/arm-support.patch: Included in Debian.
  - d/p/double-alignment.patch: Included in Debian.
  - d/rules,control: Debian also builds with avaliable system libraries
    now.
* Fix FTBFS due to gcc and boost upgrades in saucy:
  - d/p/0008-ignore-unused-local-typedefs.patch: Add -Wno-unused-typedefs
    to unbreak building with g++-4.8.
  - d/p/0009-boost-1.53.patch: Fixup signed/unsigned casting issue.

[ Robie Basak ]
* d/p/0011-Use-a-signed-char-to-store-BSONType-enumerations.patch: Fixup
  build failure on ARM due to missing signed'ness of char cast.

Show diffs side-by-side

added added

removed removed

Lines of Context:
site_scons/site_tools/unittest.py
8
8
    env._UnitTestList('$UNITTEST_LIST', test)
9
9
    env.Alias('$UNITTEST_ALIAS', test)
10
10
 
 
11
def register_module_test(env, test):
 
12
    env._UnitTestList('$MODULETEST_LIST', test)
 
13
    env.Alias('$MODULETEST_ALIAS', test)
 
14
 
11
15
def unit_test_list_builder_action(env, target, source):
12
16
    print "Generating " + str(target[0])
13
17
    ofile = open(str(target[0]), 'wb')
41
45
    env.Append(BUILDERS=dict(_UnitTestList=unit_test_list_builder))
42
46
    env.AddMethod(register_unit_test, 'RegisterUnitTest')
43
47
    env.AddMethod(build_cpp_unit_test, 'CppUnitTest')
 
48
    env.AddMethod(register_module_test, 'RegisterModuleTest')
44
49
    env.Alias('$UNITTEST_ALIAS', '$UNITTEST_LIST')
 
50
    env.Alias('$MODULETEST_ALIAS', '$MODULETEST_LIST')
 
51
    env.RegisterUnitTest([])
 
52
    env.RegisterModuleTest([])