Conversational Speech tool, rtc_test target replaced with entry in modules_unittests

Conversational Speech tool, rtc_test target replaced with entry in modules_unittests

The ConversationalSpeechTest.* unit tests are now part of modules_unittests.
The rtc_test target has been replaced with an rtc_source_set one.
The latter is included as dependency in audio_processing_unittests.

BUG=webrtc:7218
Review-Url: https://codereview.webrtc.org/2769863005
Cr-Commit-Position: refs/heads/master@{#17360}
Committed: https://chromium.googlesource.com/external/webrtc/+/4b6463c0c90eb8b41f5009e0859683e5fcae6b63

[AleBzk, 2017-03-23 09:25:30]

Description was changed from

==========
Conversational Speech tool, rtc_test target replaced with entry in
modules_unittests

The ConversationalSpeechTest.* unit tests are now part of modules_unittests.
The rtc_test target has been replaced with an rtc_source_set one.
The latter is included as dependency in audio_processing_unittests.

BUG=webrtc:7218
==========

to

==========
Conversational Speech tool, rtc_test target replaced with entry in
modules_unittests

The ConversationalSpeechTest.* unit tests are now part of modules_unittests.
The rtc_test target has been replaced with an rtc_source_set one.
The latter is included as dependency in audio_processing_unittests.

BUG=webrtc:7218
==========

[AleBzk, 2017-03-23 09:25:30]

alessiob@webrtc.org changed reviewers:
+ kjellander@webrtc.org

[AleBzk, 2017-03-23 09:26:31]

Hi Henrik,

As you requested, I patched https://codereview.webrtc.org/2749573002/ to fix the
unit test target issue.

Alessio

[AleBzk, 2017-03-23 09:57:18]

alessiob@webrtc.org changed reviewers:
+ henrik.lundin@webrtc.org

[AleBzk, 2017-03-23 09:58:44]

alessiob@webrtc.org changed reviewers:
- kjellander@webrtc.org

[AleBzk, 2017-03-23 09:58:45]

I also added you as reviewer since I need lgtm from an owner of
audio_processing.

[kjellander_webrtc, 2017-03-23 10:05:11]

kjellander@webrtc.org changed reviewers:
+ kjellander@webrtc.org

[kjellander_webrtc, 2017-03-23 10:05:12]

lgtm
My review should be enough since all relevant OWNERS files have this entry: 
per-file *.gn=*

Make sure you use the CQ so all trybots are run.

[AleBzk, 2017-03-23 10:06:32]

The CQ bit was checked by alessiob@webrtc.org

[commit-bot: I haz the power, 2017-03-23 10:06:42]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.webrtc.org/...

[commit-bot: I haz the power, 2017-03-23 10:48:28]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-03-23 10:48:29]

Try jobs failed on following builders:
  linux_memcheck on master.tryserver.webrtc (JOB_FAILED,
http://build.chromium.org/p/tryserver.webrtc/builders/linux_memcheck/builds/6565)

[AleBzk, 2017-03-23 11:12:30]

The CQ bit was checked by alessiob@webrtc.org

[commit-bot: I haz the power, 2017-03-23 11:12:32]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.webrtc.org/...

[commit-bot: I haz the power, 2017-03-23 11:33:36]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-03-23 11:33:37]

Failed to apply patch for
webrtc/modules/audio_processing/test/conversational_speech/BUILD.gn:
While running git apply --index -p1;
  error: patch failed:
webrtc/modules/audio_processing/test/conversational_speech/BUILD.gn:38
  error: webrtc/modules/audio_processing/test/conversational_speech/BUILD.gn:
patch does not apply

Patch:       webrtc/modules/audio_processing/test/conversational_speech/BUILD.gn
Index: webrtc/modules/audio_processing/test/conversational_speech/BUILD.gn
diff --git a/webrtc/modules/audio_processing/test/conversational_speech/BUILD.gn
b/webrtc/modules/audio_processing/test/conversational_speech/BUILD.gn
index
d0cb1e7e7e05eafe2587fc6e8f8ff538b96ce768..cd2341575e8b154dde39ba44bdb43cb9c884fa4f
100644
--- a/webrtc/modules/audio_processing/test/conversational_speech/BUILD.gn
+++ b/webrtc/modules/audio_processing/test/conversational_speech/BUILD.gn
@@ -12,7 +12,6 @@ group("conversational_speech") {
   testonly = true
   deps = [
     ":conversational_speech_generator",
-    ":conversational_speech_generator_unittest",
   ]
 }
 
@@ -27,8 +26,7 @@ rtc_executable("conversational_speech_generator") {
     "//webrtc/base:rtc_base_approved",
     "//webrtc/test:test_support",
   ]
-  visibility = [ ":*" ]  # Only targets in this file can depend on this.
-}  # bin
+}
 
 rtc_static_library("lib") {
   testonly = true
@@ -38,18 +36,17 @@ rtc_static_library("lib") {
   ]
   deps = []
   visibility = [ ":*" ]  # Only targets in this file can depend on this.
-}  # lib
+}
 
-rtc_test("conversational_speech_generator_unittest") {
+rtc_source_set("unittest") {
   testonly = true
+  sources = [
+    "generator_unittest.cc",
+  ]
   deps = [
     ":lib",
+    "//testing/gmock",
     "//testing/gtest",
-    "//webrtc//base:rtc_base_tests_main",
     "//webrtc/test:test_support",
   ]
-  sources = [
-    "generator_unittest.cc",
-  ]
-  visibility = [ ":*" ]  # Only targets in this file can depend on this.
 }

[hlundin-webrtc, 2017-03-23 11:46:51]

lgtm

[AleBzk, 2017-03-23 11:55:03]

The CQ bit was checked by alessiob@webrtc.org

[AleBzk, 2017-03-23 11:55:03]

The patchset sent to the CQ was uploaded after l-g-t-m from
henrik.lundin@webrtc.org, kjellander@webrtc.org
Link to the patchset: https://codereview.webrtc.org/2769863005/#ps50001 (title:
"upstream fixed")

[commit-bot: I haz the power, 2017-03-23 11:55:09]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.webrtc.org/...

[commit-bot: I haz the power, 2017-03-23 12:17:07]

CQ is committing da patch.

Bot data: {"patchset_id": 50001, "attempt_start_ts": 1490270103086220,
"parent_rev": "33bf69ae6670e339f8bff8a723ef091f997c14a8", "commit_rev":
"4b6463c0c90eb8b41f5009e0859683e5fcae6b63"}

[commit-bot: I haz the power, 2017-03-23 12:17:10]

Description was changed from

==========
Conversational Speech tool, rtc_test target replaced with entry in
modules_unittests

The ConversationalSpeechTest.* unit tests are now part of modules_unittests.
The rtc_test target has been replaced with an rtc_source_set one.
The latter is included as dependency in audio_processing_unittests.

BUG=webrtc:7218
==========

to

==========
Conversational Speech tool, rtc_test target replaced with entry in
modules_unittests

The ConversationalSpeechTest.* unit tests are now part of modules_unittests.
The rtc_test target has been replaced with an rtc_source_set one.
The latter is included as dependency in audio_processing_unittests.

BUG=webrtc:7218

Review-Url: https://codereview.webrtc.org/2769863005
Cr-Commit-Position: refs/heads/master@{#17360}
Committed:
https://chromium.googlesource.com/external/webrtc/+/4b6463c0c90eb8b41f5009e08...
==========

[commit-bot: I haz the power, 2017-03-23 12:17:11]

Committed patchset #4 (id:50001) as
https://chromium.googlesource.com/external/webrtc/+/4b6463c0c90eb8b41f5009e08...