From e91761c1a768314164cbdf6092f0b59287ea9296 Mon Sep 17 00:00:00 2001 From: Shuduo Sang Date: Fri, 31 Jul 2020 10:17:02 +0800 Subject: [PATCH 1/2] change error wording determination to comply tdengine's change. --- tests/pytest/stable/query_after_reset.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/pytest/stable/query_after_reset.py b/tests/pytest/stable/query_after_reset.py index 0e34fade5f..b66fc2eff1 100644 --- a/tests/pytest/stable/query_after_reset.py +++ b/tests/pytest/stable/query_after_reset.py @@ -76,7 +76,7 @@ class Test: tdSql.query("select * from st") except Exception as e: tdLog.info("Exception catched: %s" % repr(e)) - if ('mnode invalid table name' not in repr(e)): + if ('Table does not exist' not in repr(e)): raise Exception(repr(e)) def create_stable(self): From 3155e1ecc503171f8616f8b07ff67867b6adac32 Mon Sep 17 00:00:00 2001 From: Shengliang Guan Date: Fri, 31 Jul 2020 11:02:14 +0800 Subject: [PATCH 2/2] cmake --- src/wal/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/wal/CMakeLists.txt b/src/wal/CMakeLists.txt index baed8d0960..a9c20f643a 100644 --- a/src/wal/CMakeLists.txt +++ b/src/wal/CMakeLists.txt @@ -9,7 +9,7 @@ INCLUDE_DIRECTORIES(inc) AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/src SRC) ADD_LIBRARY(twal ${SRC}) -TARGET_LINK_LIBRARIES(twal common osdetail tutil) +TARGET_LINK_LIBRARIES(twal tutil common) ADD_SUBDIRECTORY(test)