modify Jenkfile about merge conflict
This commit is contained in:
parent
cc8a7e0f5a
commit
32a5bf57c7
|
@ -234,15 +234,16 @@ pipeline {
|
||||||
cd ${WKC}/tests/examples/nodejs
|
cd ${WKC}/tests/examples/nodejs
|
||||||
npm install td2.0-connector > /dev/null 2>&1
|
npm install td2.0-connector > /dev/null 2>&1
|
||||||
node nodejsChecker.js host=localhost
|
node nodejsChecker.js host=localhost
|
||||||
|
node test1970.js
|
||||||
cd ${WKC}/tests/connectorTest/nodejsTest/nanosupport
|
cd ${WKC}/tests/connectorTest/nodejsTest/nanosupport
|
||||||
npm install td2.0-connector > /dev/null 2>&1
|
npm install td2.0-connector > /dev/null 2>&1
|
||||||
node nanosecondTest.js
|
node nanosecondTest.js
|
||||||
node test1970.js
|
|
||||||
'''
|
'''
|
||||||
sh '''
|
sh '''
|
||||||
cd ${WKC}/tests/examples/C#/taosdemo
|
cd ${WKC}/tests/examples/C#/taosdemo
|
||||||
mcs -out:taosdemo *.cs > /dev/null 2>&1
|
mcs -out:taosdemo *.cs > /dev/null 2>&1
|
||||||
echo '' |./taosdemo
|
echo '' |./taosdemo -c /etc/taos
|
||||||
cd ${WKC}/tests/connectorTest/C#Test/nanosupport
|
cd ${WKC}/tests/connectorTest/C#Test/nanosupport
|
||||||
mcs -out:nano *.cs > /dev/null 2>&1
|
mcs -out:nano *.cs > /dev/null 2>&1
|
||||||
echo '' |./nano
|
echo '' |./nano
|
||||||
|
|
Loading…
Reference in New Issue