fix

alibaba · May 31, 2024 · d62b4c1 · d62b4c1
1 parent a58c2fd
commit d62b4c1
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 9 deletions.
diff --git a/common/test/test_alog.cpp b/common/test/test_alog.cpp
@@ -27,6 +27,7 @@ limitations under the License.
 #include <stdint.h>
 #include <unistd.h>
 #include <fcntl.h>
+#include "../../test/ci-tools.h"
 
 class LogOutputTest : public ILogOutput {
 public:
@@ -575,6 +576,7 @@ TEST(ALOG, IPAddr) {
 
 int main(int argc, char **argv)
 {
+ if (!photon::is_using_default_engine()) return 0;
  photon::vcpu_init();
  DEFER(photon::vcpu_fini());
  ::testing::InitGoogleTest(&argc, argv);

diff --git a/fs/test/test.cpp b/fs/test/test.cpp
@@ -1369,12 +1369,7 @@ TEST(Walker, basic) {
 
 int main(int argc, char **argv){
  ::testing::InitGoogleTest(&argc, argv);
-#ifdef __linux__
- int ev_engine = photon::INIT_EVENT_EPOLL;
-#else
- int ev_engine = photon::INIT_EVENT_KQUEUE;
-#endif
- if (photon::init(ev_engine, photon::INIT_IO_NONE))
+ if (photon::init(photon::INIT_EVENT_DEFAULT, photon::INIT_IO_NONE))
  return -1;
  DEFER(photon::fini());
  int ret = RUN_ALL_TESTS();

diff --git a/fs/test/test_throttledfile.cpp b/fs/test/test_throttledfile.cpp
@@ -35,6 +35,7 @@ limitations under the License.
 #include <photon/thread/thread11.h>
 #include <photon/thread/thread.h>
 #include <photon/fs/localfs.h>
+#include "../../test/ci-tools.h"
 
 #include "mock.h"
 
@@ -433,6 +434,7 @@ TEST(ThrottledFs, concurrent){
 
 int main(int argc, char **argv)
 {
+ if (!photon::is_using_default_engine()) return 0;
  ::testing::InitGoogleTest(&argc, argv);
  int ret = RUN_ALL_TESTS();
  LOG_ERROR_RETURN(0, ret, VALUE(ret));

diff --git a/test/ci-tools.cpp b/test/ci-tools.cpp
@@ -25,10 +25,11 @@ static void parse_env_eng() {
  _engine = photon::INIT_EVENT_IOURING;
  } else if (strcmp(_engine_name, "kqueue") == 0) {
  _engine = photon::INIT_EVENT_KQUEUE;
+ } else {
+ printf("invalid event engine: %s\n", _engine_name);
+ _engine_name = nullptr;
+ exit(-1);
  }
- printf("invalid event engine: %s\n", _engine_name);
- _engine_name = nullptr;
- exit(-1);
 }
 
 static const char* get_engine_name(uint64_t eng) {

diff --git a/thread/test/test.cpp b/thread/test/test.cpp
@@ -34,6 +34,8 @@ limitations under the License.
 #include "../../photon.cpp"
 #include "../common/identity-pool.cpp"
 #include <photon/common/alog-audit.h>
+#include "../../test/ci-tools.h"
+
 
 using namespace std;
 using namespace photon;
@@ -1894,6 +1896,7 @@ TEST(intrusive_list, split) {
 
 int main(int argc, char** arg)
 {
+ if (!photon::is_using_default_engine()) return 0;
  ::testing::InitGoogleTest(&argc, arg);
  gflags::ParseCommandLineFlags(&argc, &arg, true);
  default_audit_logger.log_output = log_output_stdout;