Fix tests that are broken on darwin builds.
Bug: 292141694 Test: m nothing --no-skip-soong-tests Merged-in: Ie9a2f8961a8c43bbe1388471fc0d7aadc1456c57 Change-Id: Ie9a2f8961a8c43bbe1388471fc0d7aadc1456c57
This commit is contained in:
committed by
Makoto Onuki
parent
4a9869d066
commit
ddb5152a9f
@@ -15,6 +15,7 @@
|
|||||||
package java
|
package java
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"runtime"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"android/soong/android"
|
"android/soong/android"
|
||||||
@@ -56,6 +57,10 @@ var prepareRavenwoodRuntime = android.GroupFixturePreparers(
|
|||||||
var installPathPrefix = "out/soong/host/linux-x86/testcases"
|
var installPathPrefix = "out/soong/host/linux-x86/testcases"
|
||||||
|
|
||||||
func TestRavenwoodRuntime(t *testing.T) {
|
func TestRavenwoodRuntime(t *testing.T) {
|
||||||
|
if runtime.GOOS != "linux" {
|
||||||
|
t.Skip("requires linux")
|
||||||
|
}
|
||||||
|
|
||||||
ctx := android.GroupFixturePreparers(
|
ctx := android.GroupFixturePreparers(
|
||||||
PrepareForIntegrationTestWithJava,
|
PrepareForIntegrationTestWithJava,
|
||||||
prepareRavenwoodRuntime,
|
prepareRavenwoodRuntime,
|
||||||
@@ -75,6 +80,10 @@ func TestRavenwoodRuntime(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func TestRavenwoodTest(t *testing.T) {
|
func TestRavenwoodTest(t *testing.T) {
|
||||||
|
if runtime.GOOS != "linux" {
|
||||||
|
t.Skip("requires linux")
|
||||||
|
}
|
||||||
|
|
||||||
ctx := android.GroupFixturePreparers(
|
ctx := android.GroupFixturePreparers(
|
||||||
PrepareForIntegrationTestWithJava,
|
PrepareForIntegrationTestWithJava,
|
||||||
prepareRavenwoodRuntime,
|
prepareRavenwoodRuntime,
|
||||||
|
Reference in New Issue
Block a user