add skip test config (#459)

This commit is contained in:
XuYi 2018-11-20 19:49:26 +08:00 committed by GitHub
parent 167f733e8e
commit 439996194e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 28 additions and 67 deletions

View File

@ -1,35 +0,0 @@
dist: trusty
#sudo: required
language: java
jdk:
- oraclejdk8
before_install:
# - sudo apt-get install -qq libboost-program-options-dev libevent-dev automake libtool flex bison pkg-config g++ libssl-dev
# - wget http://archive.apache.org/dist/thrift/0.9.1/thrift-0.9.1.tar.gz
# - tar xfz thrift-0.9.1.tar.gz
# - cd thrift-0.9.1
# - chmod +x ./configure
# - ./configure --disable-gen-erl --disable-gen-hs --without-cpp --without-boost --without-qt4 --without-c_glib --without-csharp --without-erlang --without-python --without-perl --without-php --without-php_extension --without-ruby --without-haskell --without-go --without-d
# - sudo make install
# - cd ..
- pip install --user codecov
# we do not need to use the following commands anymore, because now we are a assemble project!
# - git clone https://github.com/thulab/tsfile.git
# - cd tsfile
# - mvn install -DskipTests=true
# - cd ..
script:
# only SNAPSHOT version needs to do the following phase
#we do not need to run mvn cobertura:cobertura manually anymore, because we have config it in the pom.xml
# - mvn cobertura:cobertura
- bash <(curl -s https://codecov.io/bash) -t 853796a6-a626-422f-a897-ac233e121f8f
- mvn clean test
after_success:
# - mvn cobertura:cobertura
- bash <(curl -s https://codecov.io/bash) -t 853796a6-a626-422f-a897-ac233e121f8f

View File

@ -1,21 +0,0 @@
#!/bin/bash
#pwd
#rm -rf data
## get tsfile and jdbc
#rm -rf tsfile
#git clone https://github.com/thulab/tsfile.git
#cd tsfile
#mvn clean install -Dmaven.test.skip=true
#cd ..
#rm -rf iotdb-jdbc
#git clone https://github.com/thulab/iotdb-jdbc.git
#cd iotdb-jdbc
#mvn clean install -Dmaven.test.skip=true
#cd ..
##begin ...
#rm -rf data
#mvn clean test
#rm -rf data

View File

@ -9,7 +9,6 @@
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>cn.edu.tsinghua</groupId>
<artifactId>IoTDB</artifactId>
<packaging>jar</packaging>
@ -21,6 +20,7 @@
<common.cli.version>1.3.1</common.cli.version>
<antlr3.version>3.5.2</antlr3.version>
<jline.version>2.14.5</jline.version>
<iotdb.test.skip>false</iotdb.test.skip>
<it.test.includes>**/*Test.java</it.test.includes>
<it.test.excludes>**/NoTest.java</it.test.excludes>
</properties>
@ -115,6 +115,7 @@
<version>2.9</version>
<configuration>
<runOrder>alphabetical</runOrder>
<skipTests>${iotdb.test.skip}</skipTests>
<excludes>
<exclude>${it.test.excludes}</exclude>
</excludes>

View File

@ -41,10 +41,11 @@
</repository>
</distributionManagement>
<properties>
<jdbc.test.skip>false</jdbc.test.skip>
</properties>
<dependencies>
<dependency>
<groupId>cn.edu.tsinghua</groupId>
<artifactId>tsfile</artifactId>
@ -77,7 +78,14 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.18.1</version>
<configuration>
<skipTests>${jdbc.test.skip}</skipTests>
</configuration>
</plugin>
</plugins>
</build>

View File

@ -54,8 +54,7 @@ public class TsfileConnection implements Connection {
private DateTimeZone timeZone;
private boolean autoCommit;
public TsfileConnection(){
public TsfileConnection(){
}
public TsfileConnection(String url, Properties info) throws SQLException, TTransportException {

View File

@ -121,8 +121,8 @@
<logback.version>1.1.3</logback.version>
<json.version>20140107</json.version>
<joda.version>2.9.9</joda.version>
<skip.ut>false</skip.ut>
<skip.it>false</skip.it>
<!-- <skip.ut>false</skip.ut>
<skip.it>false</skip.it> -->
<spark.version>2.0.1</spark.version>
<json.version>20140107</json.version>
<libthrift.version>0.9.1</libthrift.version>
@ -232,7 +232,7 @@
<executions>
<execution>
<id>check</id>
<phase>test</phase>
<!-- <phase>test</phase> -->
<goals>
<goal>cobertura</goal>
</goals>

View File

@ -77,14 +77,15 @@
</repository>
</distributionManagement>
<properties>
<tsfile.test.skip>false</tsfile.test.skip>
</properties>
<dependencies>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
</dependency>
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
@ -145,6 +146,14 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.18.1</version>
<configuration>
<skipTests>${tsfile.test.skip}</skipTests>
</configuration>
</plugin>
</plugins>
</build>
<!-- use `mvn COMMAND -Pprifile_id` to enable desired profile-->