xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge pull request #17742 from taosdata/fix/TD-19845 

fix: failed to start unitest in mac
This commit is contained in:
Shengliang Guan 2022-10-28 16:15:16 +08:00 committed by GitHub
parent dc5706453e 57960661d4
commit b9abfd6798
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/dnode/mgmt/test/sut/inc/server.h
View File

@ -20,7 +20,8 @@ class TestServer {
public: public:
bool Start(); bool Start();
void Stop(); void Stop();
bool runnning;
private: private:
TdThread threadId; TdThread threadId;
}; };

18
source/dnode/mgmt/test/sut/src/server.cpp
View File

@ -16,8 +16,18 @@
#include "sut.h" #include "sut.h"
void* serverLoop(void* param) { void* serverLoop(void* param) {
dmInit(); TestServer* server = (TestServer*)param;
dmRun(); server->runnning = false;
if (dmInit() != 0) {
return NULL;
}
server->runnning = true;
if (dmRun() != 0) {
return NULL;
}
dmCleanup(); dmCleanup();
return NULL; return NULL;
} }
@ -26,10 +36,10 @@ bool TestServer::Start() {
TdThreadAttr thAttr; TdThreadAttr thAttr;
taosThreadAttrInit(&thAttr); taosThreadAttrInit(&thAttr);
taosThreadAttrSetDetachState(&thAttr, PTHREAD_CREATE_JOINABLE); taosThreadAttrSetDetachState(&thAttr, PTHREAD_CREATE_JOINABLE);
taosThreadCreate(&threadId, &thAttr, serverLoop, NULL); taosThreadCreate(&threadId, &thAttr, serverLoop, this);
taosThreadAttrDestroy(&thAttr); taosThreadAttrDestroy(&thAttr);
taosMsleep(2100); taosMsleep(2100);
return true; return runnning;
} }
void TestServer::Stop() { void TestServer::Stop() {

5
source/dnode/mgmt/test/sut/src/sut.cpp
View File

@ -53,7 +53,10 @@ void Testbase::Init(const char* path, int16_t port) {
taosMkDir(path); taosMkDir(path);
InitLog(TD_TMP_DIR_PATH "td"); InitLog(TD_TMP_DIR_PATH "td");
server.Start(); if (!server.Start()) {
printf("failed to start server, exit\n");
exit(0);
};
client.Init("root", "taosdata"); client.Init("root", "taosdata");
showRsp = NULL; showRsp = NULL;
} }

2
source/os/src/osDir.c
View File

@ -158,7 +158,7 @@ int32_t taosMulMkDir(const char *dirname) {
#ifdef WINDOWS #ifdef WINDOWS
code = _mkdir(temp, 0755); code = _mkdir(temp, 0755);
#elif defined(DARWIN) #elif defined(DARWIN)
code = mkdir(dirname, 0777); code = mkdir(temp, 0777);
#else #else
code = mkdir(temp, 0755); code = mkdir(temp, 0755);
#endif #endif