diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-06-15 21:46:53 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-06-15 21:46:53 +0000 |
commit | f17a03afeb2feac54dcbcf6b66cf3b582c3d144f (patch) | |
tree | 73936aba47fe1dc71e9cc05af9747036e935608c /compiler_wrapper/sysroot_flag_test.go | |
parent | fb05c036ea3bc0ffc7e7e530c04b0d9a066312cf (diff) | |
parent | 4e4201457e5f51a132101c611c79ccff9f713c8b (diff) | |
download | toolchain-utils-498ca096bf532b89e9f9520219c012e4513d4bcf.tar.gz |
Snap for 8730993 from 4e4201457e5f51a132101c611c79ccff9f713c8b to mainline-tzdata3-releaseaml_tz3_314012070aml_tz3_314012050aml_tz3_314012010aml_tz3_313110000aml_tz3_312511020aml_tz3_312511010aml_tz3_312410020aml_tz3_312410010android12-mainline-tzdata3-releaseaml_tz3_314012010
Change-Id: I8c7d4dd2dae5ae34360857d359ae3a52d87c17f0
Diffstat (limited to 'compiler_wrapper/sysroot_flag_test.go')
-rw-r--r-- | compiler_wrapper/sysroot_flag_test.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler_wrapper/sysroot_flag_test.go b/compiler_wrapper/sysroot_flag_test.go index b05a627e..308d5e96 100644 --- a/compiler_wrapper/sysroot_flag_test.go +++ b/compiler_wrapper/sysroot_flag_test.go @@ -57,7 +57,7 @@ func TestClearEmptySysrootFlagInEnv(t *testing.T) { func TestSetSysrootRelativeToWrapperPath(t *testing.T) { withTestContext(t, func(ctx *testContext) { - ctx.cfg.gccRootRelPath = "somepath" + ctx.cfg.rootRelPath = "somepath" cmd := ctx.must(callCompiler(ctx, ctx.cfg, ctx.newCommand(gccX86_64, mainCc))) if err := verifyArgOrder(cmd, @@ -69,7 +69,7 @@ func TestSetSysrootRelativeToWrapperPath(t *testing.T) { func TestSetSysrootRelativeToSymlinkedWrapperPath(t *testing.T) { withTestContext(t, func(ctx *testContext) { - ctx.cfg.gccRootRelPath = "somepath" + ctx.cfg.rootRelPath = "somepath" linkedWrapperPath := path.Join(ctx.tempDir, "a/linked/path/x86_64-cros-linux-gnu-gcc") ctx.symlink(path.Join(ctx.tempDir, gccX86_64), linkedWrapperPath) |