aboutsummaryrefslogtreecommitdiff
path: root/webrtc.gyp
diff options
context:
space:
mode:
authorandrew@webrtc.org <andrew@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>2011-09-14 17:02:44 +0000
committerandrew@webrtc.org <andrew@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>2011-09-14 17:02:44 +0000
commit19eefdc9f08f5ac65cd952ee00cbeaa6aaf893cb (patch)
tree6ac292b0c72be7500213b4f1ffe04f04f57b20d3 /webrtc.gyp
parentb524f441d0011848414d8dbe070cb839a1d4f480 (diff)
downloadwebrtc-19eefdc9f08f5ac65cd952ee00cbeaa6aaf893cb.tar.gz
Add a unit testing framework.
Populate it with the beginnings of a resampler unit test to have it do someting. Also fix a bug in resampler caught with the test ;) Review URL: http://webrtc-codereview.appspot.com/135019 git-svn-id: http://webrtc.googlecode.com/svn/trunk@595 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'webrtc.gyp')
-rw-r--r--webrtc.gyp28
1 files changed, 15 insertions, 13 deletions
diff --git a/webrtc.gyp b/webrtc.gyp
index 55f5ea9d0a..ee8c14e928 100644
--- a/webrtc.gyp
+++ b/webrtc.gyp
@@ -8,24 +8,26 @@
{
'includes': [
- 'src/common_settings.gypi', # Common settings
+ 'src/build/common.gypi',
],
- 'targets': [
+ 'targets': [
{
- 'target_name': 'auto_tests',
+ 'target_name': 'All',
'type': 'none',
'dependencies': [
- 'src/voice_engine/voice_engine.gyp:voe_auto_test',
+ 'src/common_audio/common_audio.gyp:*',
+ # TODO(andrew): enable these when all tests build.
+ #'src/common_video/common_video.gyp:*',
+ #'src/modules/modules.gyp:*',
+ #'src/system_wrappers/source/system_wrappers.gyp:*',
+ # TODO(andrew): move the merge_lib targets to a private gyp so we can
+ # target "*" in these.
'src/video_engine/video_engine.gyp:vie_auto_test',
- ],
- },
- {
- 'target_name': 'cmd_test',
- 'type': 'none',
- 'dependencies': [
+ 'src/voice_engine/voice_engine.gyp:voe_auto_test',
'src/voice_engine/voice_engine.gyp:voe_cmd_test',
],
- },
+ },
+ # TODO(andrew): move peerconnection to its own gyp.
{
'target_name': 'peerconnection_server',
'type': 'executable',
@@ -61,7 +63,7 @@
],
'msvs_settings': {
'VCLinkerTool': {
- 'SubSystem': '2', # Windows
+ 'SubSystem': '2', # Windows
},
},
'dependencies': [
@@ -116,5 +118,5 @@
},
], # targets
}, ], # OS="linux"
- ], # conditions
+ ], # conditions
}