Skip to content

Commit d911336

Browse files
committed
cherry pick 357e026
Don't use JAVA_HOME in PropertiesTest
1 parent 3e98dd0 commit d911336

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

Diff for: compiler/test/dotty/tools/dotc/config/PropertiesTest.scala

+4-3
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,16 @@ class PropertiesTest {
2929

3030
var done = false
3131
assertEquals(Properties.propOrElse(TestProperty, { done = true; "bar" }), "foo")
32-
assertTrue("Does not evaluate alt if not needed", done == false)
32+
assertFalse("Does not evaluate alt if not needed", done)
3333
}
3434

3535
@Test
3636
def testEnvOrElse(): Unit = {
3737
assertEquals(Properties.envOrElse("_PropertiesTest_NOT_DEFINED", "test"), "test")
3838

3939
var done = false
40-
assertNotEquals(Properties.envOrElse("JAVA_HOME", { done = true; "bar" }), "bar")
41-
assertTrue("Does not evaluate alt if not needed", done == false)
40+
val envName = System.getenv().keySet().iterator().next()
41+
assertNotEquals(Properties.envOrElse(envName, {done = true; "bar"}), "bar")
42+
assertFalse("Does not evaluate alt if not needed", done)
4243
}
4344
}

0 commit comments

Comments
 (0)