mollyim/webrtc
1
0
Fork 0
mirror of https://github.com/mollyim/webrtc.git synced 2025-05-12 21:30:45 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rename UNIT_TEST to WEBRTC_UNIT_TEST

Browse source 
Current name conflicts with upstream project code.

Bug: webrtc:12247
Change-Id: Ibd78273a75262772fc18fca688c29b9ba9525ce5
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/196653
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Andrey Logvin <landrey@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#32813}
This commit is contained in:
Andrey Logvin 2020-12-09 12:49:39 +00:00 committed by Commit Bot
parent 7e6290d1d2
commit b95d90b78a
10 changed files with 33 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
api/rtc_error.h
View file

@ -11,9 +11,9 @@
#ifndef API_RTC_ERROR_H_
#define API_RTC_ERROR_H_
#ifdef UNIT_TEST
#ifdef WEBRTC_UNIT_TEST
#include <ostream>
#endif // UNIT_TEST
#endif // WEBRTC_UNIT_TEST
#include <string>
#include <utility> // For std::move.
@ -161,7 +161,7 @@ class RTC_EXPORT RTCError {
RTC_EXPORT const char* ToString(RTCErrorType error);
RTC_EXPORT const char* ToString(RTCErrorDetailType error);
#ifdef UNIT_TEST
#ifdef WEBRTC_UNIT_TEST
inline std::ostream& operator<<( // no-presubmit-check TODO(webrtc:8982)
std::ostream& stream, // no-presubmit-check TODO(webrtc:8982)
RTCErrorType error) {
@ -173,7 +173,7 @@ inline std::ostream& operator<<( // no-presubmit-check TODO(webrtc:8982)
RTCErrorDetailType error) {
return stream << ToString(error);
}
#endif // UNIT_TEST
#endif // WEBRTC_UNIT_TEST
// Helper macro that can be used by implementations to create an error with a
// message and log it. |message| should be a string literal or movable

8
api/units/data_rate.h
View file

@ -11,9 +11,9 @@
#ifndef API_UNITS_DATA_RATE_H_
#define API_UNITS_DATA_RATE_H_
#ifdef UNIT_TEST
#ifdef WEBRTC_UNIT_TEST
#include <ostream> // no-presubmit-check TODO(webrtc:8982)
#endif // UNIT_TEST
#endif // WEBRTC_UNIT_TEST
#include <limits>
#include <string>
@ -142,13 +142,13 @@ inline std::string ToLogString(DataRate value) {
return ToString(value);
}
#ifdef UNIT_TEST
#ifdef WEBRTC_UNIT_TEST
inline std::ostream& operator<<( // no-presubmit-check TODO(webrtc:8982)
std::ostream& stream, // no-presubmit-check TODO(webrtc:8982)
DataRate value) {
return stream << ToString(value);
}
#endif // UNIT_TEST
#endif // WEBRTC_UNIT_TEST
} // namespace webrtc

8
api/units/data_size.h
View file

@ -11,9 +11,9 @@
#ifndef API_UNITS_DATA_SIZE_H_
#define API_UNITS_DATA_SIZE_H_
#ifdef UNIT_TEST
#ifdef WEBRTC_UNIT_TEST
#include <ostream> // no-presubmit-check TODO(webrtc:8982)
#endif // UNIT_TEST
#endif // WEBRTC_UNIT_TEST
#include <string>
#include <type_traits>
@ -53,13 +53,13 @@ inline std::string ToLogString(DataSize value) {
return ToString(value);
}
#ifdef UNIT_TEST
#ifdef WEBRTC_UNIT_TEST
inline std::ostream& operator<<( // no-presubmit-check TODO(webrtc:8982)
std::ostream& stream, // no-presubmit-check TODO(webrtc:8982)
DataSize value) {
return stream << ToString(value);
}
#endif // UNIT_TEST
#endif // WEBRTC_UNIT_TEST
} // namespace webrtc

8
api/units/frequency.h
View file

@ -10,9 +10,9 @@
#ifndef API_UNITS_FREQUENCY_H_
#define API_UNITS_FREQUENCY_H_
#ifdef UNIT_TEST
#ifdef WEBRTC_UNIT_TEST
#include <ostream> // no-presubmit-check TODO(webrtc:8982)
#endif // UNIT_TEST
#endif // WEBRTC_UNIT_TEST
#include <cstdlib>
#include <limits>
@ -89,13 +89,13 @@ inline std::string ToLogString(Frequency value) {
return ToString(value);
}
#ifdef UNIT_TEST
#ifdef WEBRTC_UNIT_TEST
inline std::ostream& operator<<( // no-presubmit-check TODO(webrtc:8982)
std::ostream& stream, // no-presubmit-check TODO(webrtc:8982)
Frequency value) {
return stream << ToString(value);
}
#endif // UNIT_TEST
#endif // WEBRTC_UNIT_TEST
} // namespace webrtc
#endif // API_UNITS_FREQUENCY_H_

8
api/units/time_delta.h
View file

@ -11,9 +11,9 @@
#ifndef API_UNITS_TIME_DELTA_H_
#define API_UNITS_TIME_DELTA_H_
#ifdef UNIT_TEST
#ifdef WEBRTC_UNIT_TEST
#include <ostream> // no-presubmit-check TODO(webrtc:8982)
#endif // UNIT_TEST
#endif // WEBRTC_UNIT_TEST
#include <cstdlib>
#include <string>
@ -92,13 +92,13 @@ inline std::string ToLogString(TimeDelta value) {
return ToString(value);
}
#ifdef UNIT_TEST
#ifdef WEBRTC_UNIT_TEST
inline std::ostream& operator<<( // no-presubmit-check TODO(webrtc:8982)
std::ostream& stream, // no-presubmit-check TODO(webrtc:8982)
TimeDelta value) {
return stream << ToString(value);
}
#endif // UNIT_TEST
#endif // WEBRTC_UNIT_TEST
} // namespace webrtc

8
api/units/timestamp.h
View file

@ -11,9 +11,9 @@
#ifndef API_UNITS_TIMESTAMP_H_
#define API_UNITS_TIMESTAMP_H_
#ifdef UNIT_TEST
#ifdef WEBRTC_UNIT_TEST
#include <ostream> // no-presubmit-check TODO(webrtc:8982)
#endif // UNIT_TEST
#endif // WEBRTC_UNIT_TEST
#include <string>
#include <type_traits>
@ -125,13 +125,13 @@ inline std::string ToLogString(Timestamp value) {
return ToString(value);
}
#ifdef UNIT_TEST
#ifdef WEBRTC_UNIT_TEST
inline std::ostream& operator<<( // no-presubmit-check TODO(webrtc:8982)
std::ostream& stream, // no-presubmit-check TODO(webrtc:8982)
Timestamp value) {
return stream << ToString(value);
}
#endif // UNIT_TEST
#endif // WEBRTC_UNIT_TEST
} // namespace webrtc

4
pc/rtp_media_utils.h
View file

@ -49,13 +49,13 @@ RtpTransceiverDirection RtpTransceiverDirectionIntersection(
RtpTransceiverDirection lhs,
RtpTransceiverDirection rhs);
#ifdef UNIT_TEST
#ifdef WEBRTC_UNIT_TEST
inline std::ostream& operator<<( // no-presubmit-check TODO(webrtc:8982)
std::ostream& os, // no-presubmit-check TODO(webrtc:8982)
RtpTransceiverDirection direction) {
return os << RtpTransceiverDirectionToString(direction);
}
#endif // UNIT_TEST
#endif // WEBRTC_UNIT_TEST
} // namespace webrtc

4
rtc_base/ip_address.h
View file

@ -80,12 +80,12 @@ class RTC_EXPORT IPAddress {
bool operator<(const IPAddress& other) const;
bool operator>(const IPAddress& other) const;
#ifdef UNIT_TEST
#ifdef WEBRTC_UNIT_TEST
inline std::ostream& operator<<( // no-presubmit-check TODO(webrtc:8982)
std::ostream& os) { // no-presubmit-check TODO(webrtc:8982)
return os << ToString();
}
#endif // UNIT_TEST
#endif // WEBRTC_UNIT_TEST
int family() const { return family_; }
in_addr ipv4_address() const;

8
rtc_base/socket_address.h
View file

@ -12,9 +12,9 @@
#define RTC_BASE_SOCKET_ADDRESS_H_
#include <string>
#ifdef UNIT_TEST
#ifdef WEBRTC_UNIT_TEST
#include <ostream> // no-presubmit-check TODO(webrtc:8982)
#endif // UNIT_TEST
#endif // WEBRTC_UNIT_TEST
#include "rtc_base/ip_address.h"
#include "rtc_base/system/rtc_export.h"
@ -127,12 +127,12 @@ class RTC_EXPORT SocketAddress {
// Parses hostname:port and [hostname]:port.
bool FromString(const std::string& str);
#ifdef UNIT_TEST
#ifdef WEBRTC_UNIT_TEST
inline std::ostream& operator<<( // no-presubmit-check TODO(webrtc:8982)
std::ostream& os) { // no-presubmit-check TODO(webrtc:8982)
return os << HostAsURIString() << ":" << port();
}
#endif // UNIT_TEST
#endif // WEBRTC_UNIT_TEST
// Determines whether this represents a missing / any IP address.
// That is, 0.0.0.0 or ::.

2
test/BUILD.gn
View file

@ -303,7 +303,7 @@ config("suppress_warning_4373") {
config("test_main_direct_config") {
visibility = [ ":*" ]
defines = [ "UNIT_TEST" ]
defines = [ "WEBRTC_UNIT_TEST" ]
}
rtc_source_set("test_support") {
visibility = [ "*" ]