Skip to content

Commit 43dea79

Browse files
committed
Revert task customization functions
1 parent ad3bdff commit 43dea79

File tree

3 files changed

+12
-17
lines changed

3 files changed

+12
-17
lines changed

.travis.yml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,12 @@ os: osx
55
# Add a TEST_DIR=[directory] row for each library (or group of libraries) to test
66
# Each will be run as an independent, hermetic test (in parallel when resources permit)
77
# on Traivs.
8-
# TEST_TASKS specifies the Gradle tasks to run.
98
env:
10-
- TEST_DIR=com.google.code.gson-gson TEST_TASKS=build
11-
- TEST_DIR=org.joda-joda-convert TEST_TASKS=build
12-
- TEST_DIR=joda-time-joda-time TEST_TASKS=build
13-
- TEST_DIR=org.joda-joda-primitives TEST_TASKS=build
14-
- TEST_DIR=org.apache.commons-commons-lang3 TEST_TASKS=build
9+
- TEST_DIR=com.google.code.gson-gson
10+
- TEST_DIR=org.joda-joda-convert
11+
- TEST_DIR=joda-time-joda-time
12+
- TEST_DIR=org.joda-joda-primitives
13+
- TEST_DIR=org.apache.commons-commons-lang3
1514

1615
# Uncomment to add a library that should fail to build, along with documentation on why.
1716
# matrix:
@@ -45,4 +44,4 @@ install:
4544

4645
# Note the install prep leaves us in the libraryBuilds directory.
4746
script:
48-
- ./run-test.sh $TEST_DIR $TEST_TASKS
47+
- ./run-test.sh $TEST_DIR

libraryBuilds/run-all.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
# Fail if anything fails.
1818
set -ev
1919

20-
./run-test.sh com.google.code.gson-gson build
21-
./run-test.sh org.joda-joda-convert build
22-
./run-test.sh joda-time-joda-time build
23-
./run-test.sh org.joda-joda-primitives build
24-
./run-test.sh org.apache.commons-commons-lang3 build
20+
./run-test.sh com.google.code.gson-gson
21+
./run-test.sh org.joda-joda-convert
22+
./run-test.sh joda-time-joda-time
23+
./run-test.sh org.joda-joda-primitives
24+
./run-test.sh org.apache.commons-commons-lang3

libraryBuilds/run-test.sh

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,5 @@ done
3535
echo Running test $TEST_DIR
3636
./gradlew wrapper
3737
./gradlew clean
38-
# 2nd through last arguments are the gradle tasks to test.
39-
for task in "${@:2}"; do
40-
./gradlew $task --stacktrace
41-
done
42-
./gradlew assemble
38+
./gradlew build --stacktrace
4339
popd

0 commit comments

Comments
 (0)