From 32a5bf57c7a18a4e909f0d0f4d32a2e7020ec048 Mon Sep 17 00:00:00 2001
From: root <root@xiaoping03>
Date: Mon, 6 Sep 2021 19:07:37 +0800
Subject: [PATCH]  modify Jenkfile about merge conflict

---
 Jenkinsfile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 189643d0f5..907126c22a 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -234,15 +234,16 @@ pipeline {
               cd ${WKC}/tests/examples/nodejs
               npm install td2.0-connector > /dev/null 2>&1
               node nodejsChecker.js host=localhost
+              node test1970.js
 	      cd ${WKC}/tests/connectorTest/nodejsTest/nanosupport
 	      npm install td2.0-connector > /dev/null 2>&1
               node nanosecondTest.js
-              node test1970.js
+              
               '''
               sh '''
                 cd ${WKC}/tests/examples/C#/taosdemo
                 mcs -out:taosdemo *.cs > /dev/null 2>&1
-                echo '' |./taosdemo
+                echo '' |./taosdemo -c /etc/taos
                 cd ${WKC}/tests/connectorTest/C#Test/nanosupport
                 mcs -out:nano *.cs > /dev/null 2>&1
                 echo '' |./nano