diff --git a/bpf/bpf_test.go b/bpf/bpf_test.go index eb0d8c8f7..0bf15db75 100644 --- a/bpf/bpf_test.go +++ b/bpf/bpf_test.go @@ -15,7 +15,6 @@ package bpf import ( - "io/ioutil" "os" "testing" @@ -23,34 +22,12 @@ import ( "android/soong/cc" ) -var buildDir string - -func setUp() { - var err error - buildDir, err = ioutil.TempDir("", "genrule_test") - if err != nil { - panic(err) - } -} - -func tearDown() { - os.RemoveAll(buildDir) -} - func TestMain(m *testing.M) { - run := func() int { - setUp() - defer tearDown() - - return m.Run() - } - - os.Exit(run()) - + os.Exit(m.Run()) } var bpfFactory = android.NewFixtureFactory( - &buildDir, + nil, cc.PrepareForTestWithCcDefaultModules, android.FixtureMergeMockFs( map[string][]byte{