diff options
Diffstat (limited to 'compiler_wrapper/testutil_test.go')
| -rw-r--r-- | compiler_wrapper/testutil_test.go | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/compiler_wrapper/testutil_test.go b/compiler_wrapper/testutil_test.go index 21b7169d..57a68df2 100644 --- a/compiler_wrapper/testutil_test.go +++ b/compiler_wrapper/testutil_test.go @@ -17,18 +17,15 @@ import ( "testing" ) -const ( - mainCc = "main.cc" - clangAndroid = "./clang" - clangTidyAndroid = "./clang-tidy" - clangX86_64 = "./x86_64-cros-linux-gnu-clang" - gccX86_64 = "./x86_64-cros-linux-gnu-gcc" - gccX86_64Eabi = "./x86_64-cros-eabi-gcc" - gccArmV7 = "./armv7m-cros-linux-gnu-gcc" - gccArmV7Eabi = "./armv7m-cros-eabi-gcc" - gccArmV8 = "./armv8m-cros-linux-gnu-gcc" - gccArmV8Eabi = "./armv8m-cros-eabi-gcc" -) +const mainCc = "main.cc" +const clangAndroid = "./clang" +const clangX86_64 = "./x86_64-cros-linux-gnu-clang" +const gccX86_64 = "./x86_64-cros-linux-gnu-gcc" +const gccX86_64Eabi = "./x86_64-cros-eabi-gcc" +const gccArmV7 = "./armv7m-cros-linux-gnu-gcc" +const gccArmV7Eabi = "./armv7m-cros-eabi-gcc" +const gccArmV8 = "./armv8m-cros-linux-gnu-gcc" +const gccArmV8Eabi = "./armv8m-cros-eabi-gcc" type testContext struct { t *testing.T @@ -141,8 +138,6 @@ func (ctx *testContext) mustFail(exitCode int) string { func (ctx *testContext) updateConfig(cfg *config) { *ctx.cfg = *cfg ctx.cfg.newWarningsDir = filepath.Join(ctx.tempDir, "fatal_clang_warnings") - ctx.cfg.triciumNitsDir = filepath.Join(ctx.tempDir, "tricium_nits") - ctx.cfg.crashArtifactsDir = filepath.Join(ctx.tempDir, "clang_crash_diagnostics") } func (ctx *testContext) newCommand(path string, args ...string) *command { |