fix

alibaba · Apr 19, 2024 · 36b9ff4 · 36b9ff4
1 parent 42e7920
commit 36b9ff4
Show file tree

Hide file tree

Showing 26 changed files with 37 additions and 25 deletions.
diff --git a/common/checksum/test/test_checksum.cpp b/common/checksum/test/test_checksum.cpp
@@ -4,7 +4,7 @@
 #include <iostream>
 #include <sstream>
 #include <string>
-#include "../../test/gtest.h"
+#include "../../../test/gtest.h"
 
 #ifndef DATA_DIR
 #define DATA_DIR ""

diff --git a/common/executor/test/test_async.cpp b/common/executor/test/test_async.cpp
@@ -26,7 +26,7 @@ limitations under the License.
 #include <immintrin.h>
 #include <chrono>
 #include <thread>
-#include "../../test/gtest.h"
+#include "../../../test/gtest.h"
 
 using namespace photon;
 

diff --git a/common/executor/test/test_easyexport.cpp b/common/executor/test/test_easyexport.cpp
@@ -23,7 +23,7 @@ limitations under the License.
 #include <photon/thread/thread.h>
 #include <photon/common/executor/executor.h>
 #include <photon/common/executor/easyawaiter.h>
-#include "../../test/gtest.h"
+#include "../../../test/gtest.h"
 
 using namespace photon;
 

diff --git a/common/executor/test/test_std.cpp b/common/executor/test/test_std.cpp
@@ -21,7 +21,7 @@ limitations under the License.
 #include <photon/fs/localfs.h>
 #include <photon/common/utility.h>
 #include <photon/common/executor/executor.h>
-#include "../../test/gtest.h"
+#include "../../../test/gtest.h"
 
 using namespace photon;
 

diff --git a/common/memory-stream/test/test.cpp b/common/memory-stream/test/test.cpp
@@ -22,7 +22,7 @@ limitations under the License.
 #include <photon/common/utility.h>
 #include <photon/common/alog.h>
 #include <photon/common/alog-stdstring.h>
-#include "../../test/gtest.h"
+#include "../../../test/gtest.h"
 
 using namespace std;
 using namespace photon;

diff --git a/common/stream-messenger/test/test.cpp b/common/stream-messenger/test/test.cpp
@@ -22,7 +22,7 @@ limitations under the License.
 #include <photon/common/memory-stream/memory-stream.h>
 #include <photon/common/utility.h>
 #include <photon/common/alog.h>
-#include "../../test/gtest.h"
+#include "../../../test/gtest.h"
 using namespace std;
 using namespace photon;
 using namespace StreamMessenger;

diff --git a/fs/extfs/test/test.cpp b/fs/extfs/test/test.cpp
@@ -27,7 +27,7 @@ limitations under the License.
 #include <photon/common/alog.h>
 #include <photon/common/alog-stdstring.h>
 #include <photon/common/enumerable.h>
-#include "../../test/gtest.h"
+#include "../../../test/gtest.h"
 
 #define FILE_SIZE (2 * 1024 * 1024)
 

diff --git a/net/http/test/client_function_test.cpp b/net/http/test/client_function_test.cpp
@@ -38,7 +38,7 @@ limitations under the License.
 #include <photon/thread/thread11.h>
 #include <photon/common/stream.h>
 #include <photon/fs/localfs.h>
-#include "../../test/gtest.h"
+#include "../../../test/gtest.h"
 #include "to_url.h"
 
 using namespace photon::net;

diff --git a/net/http/test/client_tls_test.cpp b/net/http/test/client_tls_test.cpp
@@ -15,7 +15,6 @@ limitations under the License.
 */
 
 #include <openssl/ssl.h>
-#include <gtest/gtest.h>
 
 #include <photon/photon.h>
 #include <photon/common/alog.h>
@@ -26,6 +25,7 @@ limitations under the License.
 #include <photon/net/http/message.h>
 #include <photon/net/http/server.h>
 #include <photon/net/http/client.h>
+#include "../../../test/gtest.h"
 #include "to_url.h"
 
 #include "../../test/cert-key.cpp"

diff --git a/net/http/test/cookie_jar_test.cpp b/net/http/test/cookie_jar_test.cpp
@@ -21,7 +21,6 @@ limitations under the License.
 #undef private
 
 #include <fcntl.h>
-#include <gtest/gtest.h>
 #include <time.h>
 
 #include <chrono>
@@ -34,6 +33,7 @@ limitations under the License.
 #include <iostream>
 #include <photon/common/alog.h>
 #include <photon/common/alog-stdstring.h>
+#include "../../../test/gtest.h"
 
 using namespace photon;
 using namespace photon::net;

diff --git a/net/http/test/headers_test.cpp b/net/http/test/headers_test.cpp
@@ -22,7 +22,7 @@ limitations under the License.
 #undef private
 
 #include <fcntl.h>
-#include <gtest/gtest.h>
+#include "../../../test/gtest.h"
 
 #include <chrono>
 #include <cstddef>

diff --git a/net/http/test/server_function_test.cpp b/net/http/test/server_function_test.cpp
@@ -24,7 +24,7 @@ limitations under the License.
 #include <photon/thread/thread11.h>
 #include <photon/common/alog-stdstring.h>
 #include <photon/fs/localfs.h>
-#include "../../test/gtest.h"
+#include "../../../test/gtest.h"
 #include "../server.h"
 #include "to_url.h"
 

diff --git a/net/security-context/test/test-sasl.cpp b/net/security-context/test/test-sasl.cpp
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-#include <gtest/gtest.h>
+#include "../../../test/gtest.h"
 
 #include <photon/common/alog-stdstring.h>
 #include <photon/net/socket.h>

diff --git a/net/security-context/test/test.cpp b/net/security-context/test/test.cpp
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-#include <gtest/gtest.h>
+#include "../../../test/gtest.h"
 
 #include <photon/net/socket.h>
 #include <photon/io/fd-events.h>

diff --git a/net/test/test.cpp b/net/test/test.cpp
@@ -121,7 +121,7 @@ void tcp_client() {
     LOG_DEBUG(VALUE(sock), VALUE(errno));
     EndPoint epget = sock->getpeername();
     LOG_DEBUG("Connected `", epget);
-    EXPECT_TRUE(ep.port = epget.port);
+    EXPECT_EQ(ep.port, epget.port);
     char buff[] = "Hello";
     char recv[256];
     sock->send("Hello", 5);

diff --git a/rpc/test/test-ooo.cpp b/rpc/test/test-ooo.cpp
@@ -19,12 +19,14 @@ limitations under the License.
 #include <queue>
 #include <thread>
 #include <algorithm>
+#include "../../test/gtest.h"
+#include <gflags/gflags.h>
+#include <photon/common/alog.h>
 #define private public
 #define protected public
 #include "../out-of-order-execution.cpp"
 #include "../../thread/thread.cpp"
 #include <photon/thread/thread11.h>
-#include "../../tools/gtest.h"
 
 using namespace std;
 using namespace photon;

diff --git a/rpc/test/test-rpc-message.cpp b/rpc/test/test-rpc-message.cpp
@@ -21,7 +21,7 @@ limitations under the License.
 #include <photon/common/utility.h>
 #include <photon/common/alog.h>
 #include <photon/net/socket.h>
-#include "../../tools/gtest.h"
+#include "../../test/gtest.h"
 
 
 struct map_value : photon::rpc::Message {

diff --git a/test/gtest.h b/test/gtest.h
@@ -0,0 +1,10 @@
+#pragma once
+
+#pragma GCC diagnostic push
+#ifdef __clang__
+#pragma GCC diagnostic ignored "-sign-compare"
+#endif
+#include <gtest/gtest.h>
+#include <gtest/gtest-spi.h>
+#pragma GCC diagnostic pop
+
diff --git a/thread/test/perf_usleepdefer_semaphore.cpp b/thread/test/perf_usleepdefer_semaphore.cpp
@@ -17,7 +17,7 @@ limitations under the License.
 #include "../thread.h"
 #include "../thread11.h"
 #include <photon/io/fd-events.h>
-#include <gtest/gtest.h>
+#include "../../test/gtest.h"
 #include <thread>
 #include <photon/common/metric-meter/metrics.h>
 #include <photon/common/alog.h>

diff --git a/thread/test/test-lib-data.cpp b/thread/test/test-lib-data.cpp
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-#include <gtest/gtest.h>
+#include "../../test/gtest.h"
 #include <libgen.h>
 #include <photon/common/utility.h>
 #include <photon/photon.h>

diff --git a/thread/test/test-multi-vcpu-locking.cpp b/thread/test/test-multi-vcpu-locking.cpp
@@ -17,7 +17,7 @@ limitations under the License.
 #include <atomic>
 #include <chrono>
 #include <vector>
-#include <gtest/gtest.h>
+#include "../../test/gtest.h"
 #include <photon/photon.h>
 #include <photon/thread/std-compat.h>
 #include <photon/common/alog.h>

diff --git a/thread/test/test-pooled-stack-allocator.cpp b/thread/test/test-pooled-stack-allocator.cpp
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-#include <gtest/gtest.h>
+#include "../../test/gtest.h"
 #include <photon/common/alog.h>
 #include <photon/photon.h>
 #include <photon/thread/stack-allocator.h>

diff --git a/thread/test/test-specific-key.cpp b/thread/test/test-specific-key.cpp
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-#include <gtest/gtest.h>
+#include "../../test/gtest.h"
 
 #include <photon/thread/thread11.h>
 #include <photon/thread/thread-key.h>

diff --git a/thread/test/test-std-compat.cpp b/thread/test/test-std-compat.cpp
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-#include <gtest/gtest.h>
+#include "../../test/gtest.h"
 
 #include <numeric>
 #include <photon/thread/workerpool.h>

diff --git a/thread/test/test-thread-local.cpp b/thread/test/test-thread-local.cpp
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-#include <gtest/gtest.h>
+#include "../../test/gtest.h"
 
 #include <photon/thread/thread11.h>
 #include <photon/thread/thread-local.h>

diff --git a/thread/test/test-tls-order-photon.cpp b/thread/test/test-tls-order-photon.cpp
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-#include <gtest/gtest.h>
+#include "../../test/gtest.h"
 #include <photon/thread/std-compat.h>
 #include <photon/common/alog.h>