From 4ffe3f76caf6ccb5f327889e862e5111c5cf9f7c Mon Sep 17 00:00:00 2001 From: Shuduo Sang Date: Sun, 6 Nov 2022 12:46:48 +0800 Subject: [PATCH 1/5] test: rollback taosadapter for taos-tools ci test --- cmake/taosadapter_CMakeLists.txt.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/taosadapter_CMakeLists.txt.in b/cmake/taosadapter_CMakeLists.txt.in index c507ae2536..5b8192831e 100644 --- a/cmake/taosadapter_CMakeLists.txt.in +++ b/cmake/taosadapter_CMakeLists.txt.in @@ -2,7 +2,7 @@ # taosadapter ExternalProject_Add(taosadapter GIT_REPOSITORY https://github.com/taosdata/taosadapter.git - GIT_TAG 8c3d57d + GIT_TAG a11131c SOURCE_DIR "${TD_SOURCE_DIR}/tools/taosadapter" BINARY_DIR "" #BUILD_IN_SOURCE TRUE From a350794ea70f7a93b128e123606782f6aa8616c2 Mon Sep 17 00:00:00 2001 From: Shuduo Sang Date: Mon, 31 Jul 2023 21:23:49 +0800 Subject: [PATCH 2/5] test: add test_R.sh --- tests/docs-examples-test/test_R.sh | 14 ++++++++++++++ tests/parallel_test/cases.task | 3 ++- 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100755 tests/docs-examples-test/test_R.sh diff --git a/tests/docs-examples-test/test_R.sh b/tests/docs-examples-test/test_R.sh new file mode 100755 index 0000000000..d59daf5d34 --- /dev/null +++ b/tests/docs-examples-test/test_R.sh @@ -0,0 +1,14 @@ +#!/bin/bash + +set -e + +pgrep taosd || taosd >> /dev/null 2>&1 & +pgrep taosadapter || taosadapter >> /dev/null 2>&1 & + +cd ../../docs/examples/R + +jar_path=`find ../../../../debug/build -name taos-jdbcdriver-*-dist.jar` +echo jar_path=$jar_path +R -f connect_native.r --args $jar_path +# R -f connect_rest.r --args $jar_path # bug 14704 + diff --git a/tests/parallel_test/cases.task b/tests/parallel_test/cases.task index 1ec5102d9b..3dce8ccfec 100644 --- a/tests/parallel_test/cases.task +++ b/tests/parallel_test/cases.task @@ -1,4 +1,4 @@ -#Coulumn Define +#Column Define #caseID,rerunTimes,Run with Sanitizer,casePath,caseCommand #NA,NA,y or n,script,./test.sh -f tsim/user/basic.sim @@ -1218,3 +1218,4 @@ ,,n,docs-examples-test,bash csharp.sh ,,n,docs-examples-test,bash jdbc.sh ,,n,docs-examples-test,bash go.sh +,,n,docs-examples-test,bash test_R.sh From f2728a65d26a4054b7c247f9c74d8ac58d38e6d7 Mon Sep 17 00:00:00 2001 From: Shuduo Sang Date: Mon, 31 Jul 2023 21:34:10 +0800 Subject: [PATCH 3/5] test: wget jdbc dist.jar --- tests/docs-examples-test/test_R.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/docs-examples-test/test_R.sh b/tests/docs-examples-test/test_R.sh index d59daf5d34..bc850ecd6e 100755 --- a/tests/docs-examples-test/test_R.sh +++ b/tests/docs-examples-test/test_R.sh @@ -6,8 +6,9 @@ pgrep taosd || taosd >> /dev/null 2>&1 & pgrep taosadapter || taosadapter >> /dev/null 2>&1 & cd ../../docs/examples/R +wget https://repo1.maven.org/maven2/com/taosdata/jdbc/taos-jdbcdriver/3.2.4/taos-jdbcdriver-3.2.4-dist.jar -jar_path=`find ../../../../debug/build -name taos-jdbcdriver-*-dist.jar` +jar_path=`find . -name taos-jdbcdriver-*-dist.jar` echo jar_path=$jar_path R -f connect_native.r --args $jar_path # R -f connect_rest.r --args $jar_path # bug 14704 From 0666baaf0696f8c36582193ddf0355deebea0586 Mon Sep 17 00:00:00 2001 From: Shuduo Sang Date: Tue, 1 Aug 2023 13:37:47 +0800 Subject: [PATCH 4/5] fix: wget check if file exists --- tests/docs-examples-test/test_R.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/docs-examples-test/test_R.sh b/tests/docs-examples-test/test_R.sh index bc850ecd6e..707ea02704 100755 --- a/tests/docs-examples-test/test_R.sh +++ b/tests/docs-examples-test/test_R.sh @@ -6,7 +6,7 @@ pgrep taosd || taosd >> /dev/null 2>&1 & pgrep taosadapter || taosadapter >> /dev/null 2>&1 & cd ../../docs/examples/R -wget https://repo1.maven.org/maven2/com/taosdata/jdbc/taos-jdbcdriver/3.2.4/taos-jdbcdriver-3.2.4-dist.jar +wget -N https://repo1.maven.org/maven2/com/taosdata/jdbc/taos-jdbcdriver/3.2.4/taos-jdbcdriver-3.2.4-dist.jar jar_path=`find . -name taos-jdbcdriver-*-dist.jar` echo jar_path=$jar_path From 872844592e31d08aec4ae96e5f0785ee9710b4af Mon Sep 17 00:00:00 2001 From: Shuduo Sang Date: Tue, 1 Aug 2023 13:39:20 +0800 Subject: [PATCH 5/5] test: add readme.txt --- docs/examples/R/readme.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 docs/examples/R/readme.txt diff --git a/docs/examples/R/readme.txt b/docs/examples/R/readme.txt new file mode 100644 index 0000000000..131a324aa4 --- /dev/null +++ b/docs/examples/R/readme.txt @@ -0,0 +1 @@ +apt install -y libbz2-dev libpcre2-dev libicu-dev