diff options
| author | binji@chromium.org <binji@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-12 00:34:05 +0000 |
|---|---|---|
| committer | binji@chromium.org <binji@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-12 00:34:05 +0000 |
| commit | 306e285e4cf29ca711a90220b3a6955874f868f0 (patch) | |
| tree | 9deadaaf8f331cb87ab5021a736967bba928a19f /native_client_sdk | |
| parent | f5eabc375b3a6bfd4d4dc9880bbc2945db9b4f2c (diff) | |
| download | chromium_src-306e285e4cf29ca711a90220b3a6955874f868f0.zip chromium_src-306e285e4cf29ca711a90220b3a6955874f868f0.tar.gz chromium_src-306e285e4cf29ca711a90220b3a6955874f868f0.tar.bz2 | |
[NaCl SDK] Add gmock library to be build by build_sdk.py (only for testing)
BUG=none
R=noelallen@chromium.org
NOTRY=true
Review URL: https://chromiumcodereview.appspot.com/11098080
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@161460 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'native_client_sdk')
| -rwxr-xr-x | native_client_sdk/src/build_tools/build_sdk.py | 1 | ||||
| -rw-r--r-- | native_client_sdk/src/libraries/gmock/library.dsc | 55 |
2 files changed, 56 insertions, 0 deletions
diff --git a/native_client_sdk/src/build_tools/build_sdk.py b/native_client_sdk/src/build_tools/build_sdk.py index f55069c..3f9fc5b 100755 --- a/native_client_sdk/src/build_tools/build_sdk.py +++ b/native_client_sdk/src/build_tools/build_sdk.py @@ -802,6 +802,7 @@ TEST_EXAMPLE_LIST = [ ] TEST_LIBRARY_LIST = [ + 'gmock', 'gtest', 'gtest_ppapi', ] diff --git a/native_client_sdk/src/libraries/gmock/library.dsc b/native_client_sdk/src/libraries/gmock/library.dsc new file mode 100644 index 0000000..a8feec2 --- /dev/null +++ b/native_client_sdk/src/libraries/gmock/library.dsc @@ -0,0 +1,55 @@ +{ + 'TOOLS': ['newlib', 'glibc', 'win', 'linux', 'pnacl'], + 'SEARCH': [ + '../../../../testing/gmock/include/gmock', + '../../../../testing/gmock/include/gmock/internal', + '../../../../testing/gmock/src', + ], + 'TARGETS': [ + { + 'NAME' : 'gmock', + 'TYPE' : 'lib', + 'SOURCES' : [ + 'gmock.cc', + 'gmock-matchers.cc', + 'gmock-cardinalities.cc', + 'gmock-internal-utils.cc', + 'gmock-spec-builders.cc', + ], + # gmock-spec-builders.cc:248: error: enumeration value ‘FAIL’ not handled in switch + 'CXXFLAGS': ['-Wno-switch-enum'], + } + ], + 'HEADERS': [ + { + 'FILES': [ + 'gmock-actions.h', + 'gmock-cardinalities.h', + 'gmock-generated-actions.h', + 'gmock-generated-actions.h.pump', + 'gmock-generated-function-mockers.h', + 'gmock-generated-function-mockers.h.pump', + 'gmock-generated-matchers.h', + 'gmock-generated-matchers.h.pump', + 'gmock-generated-nice-strict.h', + 'gmock-generated-nice-strict.h.pump', + 'gmock.h', + 'gmock-matchers.h', + 'gmock-more-actions.h', + 'gmock-spec-builders.h', + ], + 'DEST': 'include/gmock', + }, + { + 'FILES': [ + 'gmock-generated-internal-utils.h', + 'gmock-generated-internal-utils.h.pump', + 'gmock-internal-utils.h', + 'gmock-port.h', + ], + 'DEST': 'include/gmock/internal', + }, + ], + 'DEST': 'testlibs', + 'NAME': 'gmock', +} |