Skip to content

Commit 5d25244

Browse files
Set a different jdk went running forking test (fix scala#77)
1 parent a4f7b08 commit 5d25244

File tree

3 files changed

+40
-7
lines changed

3 files changed

+40
-7
lines changed

.travis.yml

+7-6
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ scala:
55
- 2.12.6
66
- 2.13.0-M4
77
jdk:
8-
- openjdk7
8+
- openjdk6
99
- oraclejdk8
1010
env:
1111
global:
@@ -23,10 +23,10 @@ env:
2323
matrix:
2424
exclude:
2525
# > 2.12 requires jdk8
26-
- jdk: openjdk7
26+
- jdk: openjdk6
2727
scala: 2.12.6
2828

29-
- jdk: openjdk7
29+
- jdk: openjdk6
3030
scala: 2.13.0-M4
3131

3232
# ?
@@ -45,9 +45,9 @@ matrix:
4545

4646
# | jdk | scala | scala target | scala target version | scalafix test |
4747
# | ----------- | --------- | ------------ | -------------------- |---------------|
48-
# | openjdk7 | 2.11.12 | jvm | | |
49-
# | openjdk7 | 2.11.12 | js | 0.6.23 | |
50-
# | openjdk7 | 2.11.12 | js | 1.0.0-M3 | |
48+
# | openjdk6 | 2.11.12 | jvm | | |
49+
# | openjdk6 | 2.11.12 | js | 0.6.23 | |
50+
# | openjdk6 | 2.11.12 | js | 1.0.0-M3 | |
5151
# | oraclejdk8 | 2.12.6 | jvm | | |
5252
# | oraclejdk8 | 2.12.6 | js | 0.6.23 | |
5353
# | oraclejdk8 | 2.12.6 | js | 1.0.0-M3 | |
@@ -58,6 +58,7 @@ matrix:
5858
before_script: ./checkCLA.sh
5959
script:
6060
- java -version
61+
- echo $JAVA_HOME
6162
- admin/build.sh
6263

6364
cache:

build.sbt

+8-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,14 @@ lazy val compat = crossProject(JSPlatform, JVMPlatform)
3232
)
3333
.jvmSettings(
3434
OsgiKeys.exportPackage := Seq(s"scala.collection.compat.*;version=${version.value}"),
35-
libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % "test"
35+
libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % "test",
36+
javaHome := {
37+
val oldValue = javaHome.value
38+
val isOnCi = sys.env.get("CI").isDefined
39+
40+
if (isOnCi) Some(file(sys.env("JAVA_HOME")))
41+
else oldValue
42+
}
3643
)
3744
.jsSettings(
3845
scalacOptions += {
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
package test.scala.collection
2+
3+
import org.junit.Assert._
4+
import org.junit.Test
5+
6+
class JdkVersionTest {
7+
8+
@Test
9+
def testJavaVersion: Unit = {
10+
val isOnCi = sys.env.get("CI").isDefined
11+
12+
if (isOnCi) {
13+
val travisJdkVersion = sys.env("TRAVIS_JDK_VERSION")
14+
val jdkVersion = sys.props("java.specification.version")
15+
16+
if (travisJdkVersion == "openjdk6") {
17+
assertEquals(jdkVersion, "1.6")
18+
} else if (travisJdkVersion == "oraclejdk8") {
19+
assertEquals(jdkVersion, "1.8")
20+
} else {
21+
throw new Exception(s"Unknown CI jdk version: $travisJdkVersion")
22+
}
23+
}
24+
}
25+
}

0 commit comments

Comments
 (0)