This is an automated email from the ASF dual-hosted git repository. sai_boorlagadda pushed a commit to branch feature/GEODE-5212 in repository https://gitbox.apache.org/repos/asf/geode.git
commit 8f329859b74d7280c564a0d24d374ec0a7122c9c Author: Sai Boorlagadda <[email protected]> AuthorDate: Tue Jul 24 17:39:17 2018 -0700 use testCategory property to run GfshTest --- ci/scripts/test-run.sh | 5 +++++ gradle/test.gradle | 9 --------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/ci/scripts/test-run.sh b/ci/scripts/test-run.sh index e441981..898edfe 100755 --- a/ci/scripts/test-run.sh +++ b/ci/scripts/test-run.sh @@ -23,6 +23,7 @@ export BUILDROOT=$(pwd) export DEST_DIR=${BUILDROOT}/built-geode export GRADLE_TASK=${1} export BASE_FILENAME=${2} +export GRADLE_TEST_CATEGORY=${3} export TMPDIR=${DEST_DIR}/tmp export GEODE_BUILD=${DEST_DIR}/test export GEODE_BUILD_VERSION_NUMBER=$(grep "versionNumber *=" geode/gradle.properties | awk -F "=" '{print $2}' | tr -d ' ') @@ -114,6 +115,10 @@ fi DEFAULT_GRADLE_TASK_OPTIONS="--no-daemon -x javadoc -x spotlessCheck" +if [[ -n "${GRADLE_TEST_CATEGORY}" ]]; then + GRADLE_TASK_OPTIONS="-PtestCategory=${GRADLE_TEST_CATEGORY}" +fi + mkdir -p ${GEODE_BUILD} if [ -v CALL_STACK_TIMEOUT ]; then geode-ci/ci/scripts/capture-call-stacks.sh ${CALL_STACK_TIMEOUT} & diff --git a/gradle/test.gradle b/gradle/test.gradle index 987229a..18ce11b 100644 --- a/gradle/test.gradle +++ b/gradle/test.gradle @@ -133,15 +133,6 @@ subprojects { outputs.upToDateWhen{false} } - task gfshDistributedTest(type:Test) { - useJUnit { - includeCategories 'org.apache.geode.test.junit.categories.GfshTest' - excludeCategories 'org.apache.geode.test.junit.categories.FlakyTest' - } - forkEvery 1 - outputs.upToDateWhen{false} - } - task flakyTest(type:Test) { useJUnit { includeCategories 'org.apache.geode.test.junit.categories.FlakyTest'
