diff options
author | Zach Johnson <zachoverflow@google.com> | 2022-02-23 19:46:04 -0800 |
---|---|---|
committer | William Escande <wescande@google.com> | 2022-03-09 14:32:36 +0100 |
commit | 81e644e948de9ff500f35ee128bc5183c83d0930 (patch) | |
tree | 87508d1024a504309916df1274d520d9a7110281 /system/gd/os/linux_generic/queue_unittest.cc | |
parent | 0be69f7313948a287e4c814817cf37397bd45fe4 (diff) |
check check, is anyone there? *static*
* statically link libbluetooth into libbluetooth_jni
* clean up some build rule defaults
* statically link libchrome
* stop using whole static libs, to increase ability to prune unused code
:party:
:party:
Still some issue on local test. I suppose they should only be run in
the test suite. Test are:
* bluetooth-test-audio-hal-interface
* bluetooth_flatbuffer_bundler_test
* net_test_rfcomm_suite
* net_test_stack_rfcomm
Bug: 220805766
Test: compile, verify BT boots & basic use cases work
Testeted with all cc_test in packages/modules/Bluetooth:
atest $(grep -w cc_test -A 1 $(find packages/modules/Bluetooth -name Android.bp) | grep name | cut -d '"' -f 2)
Test: m bluetoothtbd
Test: atest bluetoothtbd_test
Ignore-AOSP-First: apex changes not in AOSP yet
Change-Id: I0d232c8bcbe1f9065c6e6caa75021a6cd627c78f
Diffstat (limited to 'system/gd/os/linux_generic/queue_unittest.cc')
-rw-r--r-- | system/gd/os/linux_generic/queue_unittest.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/system/gd/os/linux_generic/queue_unittest.cc b/system/gd/os/linux_generic/queue_unittest.cc index 90f061ccdb..3739735a0a 100644 --- a/system/gd/os/linux_generic/queue_unittest.cc +++ b/system/gd/os/linux_generic/queue_unittest.cc @@ -157,7 +157,7 @@ class TestDequeueEnd { std::unique_ptr<std::string> data = queue_->TryDequeue(); buffer_.push(std::move(data)); - if (buffer_.size() == capacity_) { + if (buffer_.size() == (size_t)capacity_) { queue_->UnregisterDequeue(); } @@ -475,7 +475,7 @@ TEST_F(QueueTest, queue_becomes_full_dequeue_callback_slower) { // Wait for enqueue buffer empty and expect queue is full enqueue_future.wait(); EXPECT_EQ(enqueue_future.get(), 0); - EXPECT_GE(test_dequeue_end.buffer_.size(), kQueueSize - 1); + EXPECT_GE(test_dequeue_end.buffer_.size(), (size_t)(kQueueSize - 1)); test_dequeue_end.UnregisterDequeue(); } @@ -535,7 +535,7 @@ TEST_F(QueueTest, queue_becomes_non_full_during_test) { // Expect kQueueSize data block in enqueue end buffer std::this_thread::sleep_for(std::chrono::milliseconds(20)); - EXPECT_EQ(test_enqueue_end.buffer_.size(), kQueueSize); + EXPECT_EQ(test_enqueue_end.buffer_.size(), (size_t)kQueueSize); // Register dequeue std::unordered_map<int, std::promise<int>> dequeue_promise_map; |