diff options
Diffstat (limited to 'compiler_wrapper/sysroot_flag_test.go')
| -rw-r--r-- | compiler_wrapper/sysroot_flag_test.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/compiler_wrapper/sysroot_flag_test.go b/compiler_wrapper/sysroot_flag_test.go index 93d995d9..295a1ab9 100644 --- a/compiler_wrapper/sysroot_flag_test.go +++ b/compiler_wrapper/sysroot_flag_test.go @@ -8,7 +8,7 @@ import ( func TestOmitSysrootGivenUserDefinedSysroot(t *testing.T) { withTestContext(t, func(ctx *testContext) { runWithCompiler := func(compiler string) { - cmd := ctx.must(calcCompilerCommandAndCompareToOld(ctx, ctx.cfg, + cmd := ctx.must(callCompiler(ctx, ctx.cfg, ctx.newCommand(compiler, "--sysroot=/somepath", mainCc))) if err := verifyArgOrder(cmd, "--sysroot=/somepath", mainCc); err != nil { t.Error(err) @@ -26,7 +26,7 @@ func TestOmitSysrootGivenUserDefinedSysroot(t *testing.T) { func TestSetSysrootFlagFromEnv(t *testing.T) { withTestContext(t, func(ctx *testContext) { ctx.env = []string{"SYSROOT=/envpath"} - cmd := ctx.must(calcCompilerCommandAndCompareToOld(ctx, ctx.cfg, + cmd := ctx.must(callCompiler(ctx, ctx.cfg, ctx.newCommand(gccX86_64, mainCc))) if err := verifyArgOrder(cmd, "--sysroot=/envpath", mainCc); err != nil { t.Error(err) @@ -37,7 +37,7 @@ func TestSetSysrootFlagFromEnv(t *testing.T) { func TestSetSysrootRelativeToWrapperPath(t *testing.T) { withTestContext(t, func(ctx *testContext) { ctx.cfg.rootRelPath = "somepath" - cmd := ctx.must(calcCompilerCommandAndCompareToOld(ctx, ctx.cfg, + cmd := ctx.must(callCompiler(ctx, ctx.cfg, ctx.newCommand(gccX86_64, mainCc))) if err := verifyArgOrder(cmd, "--sysroot="+ctx.tempDir+"/somepath/usr/x86_64-cros-linux-gnu", mainCc); err != nil { @@ -52,7 +52,7 @@ func TestSetSysrootRelativeToSymlinkedWrapperPath(t *testing.T) { linkedWrapperPath := path.Join(ctx.tempDir, "a/linked/path/x86_64-cros-linux-gnu-gcc") ctx.symlink(path.Join(ctx.tempDir, gccX86_64), linkedWrapperPath) - cmd := ctx.must(calcCompilerCommandAndCompareToOld(ctx, ctx.cfg, + cmd := ctx.must(callCompiler(ctx, ctx.cfg, ctx.newCommand(linkedWrapperPath, mainCc))) if err := verifyArgOrder(cmd, "--sysroot="+ctx.tempDir+"/somepath/usr/x86_64-cros-linux-gnu", mainCc); err != nil { |