cherry pick 357e026

Don't use JAVA_HOME in PropertiesTest
scala · Dec 20, 2024 · d911336 · d911336
1 parent 3e98dd0
commit d911336
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/compiler/test/dotty/tools/dotc/config/PropertiesTest.scala b/compiler/test/dotty/tools/dotc/config/PropertiesTest.scala
@@ -29,15 +29,16 @@ class PropertiesTest {
 
     var done = false
     assertEquals(Properties.propOrElse(TestProperty, { done = true; "bar" }), "foo")
-    assertTrue("Does not evaluate alt if not needed", done == false)
+    assertFalse("Does not evaluate alt if not needed", done)
   }
 
   @Test
   def testEnvOrElse(): Unit = {
     assertEquals(Properties.envOrElse("_PropertiesTest_NOT_DEFINED", "test"), "test")
 
     var done = false
-    assertNotEquals(Properties.envOrElse("JAVA_HOME", { done = true; "bar" }), "bar")
-    assertTrue("Does not evaluate alt if not needed", done == false)
+    val envName = System.getenv().keySet().iterator().next()
+    assertNotEquals(Properties.envOrElse(envName, {done = true; "bar"}), "bar")
+    assertFalse("Does not evaluate alt if not needed", done)
   }
 }