[NFC][AVR][clang] Add test for D107672

[mhjacobson]

Summary

Add test that ensures that an avr-libc in $SYSROOT/avr is found, modeled after the similar test checking for $SYSROOT/usr/lib/avr.

[benshi001]

clang/test/Driver/avr-toolchain.c

22–23

Please do not change existing tests, you can add new lines.

[benshi001]

We need not add another basic_avr_tree_opt_local, since you added /avr to possible avr-libc pathes, you can test your change by specifying --sysroot %S/Inputs/basic_avr_tree/usr/lib/ .

[mhjacobson]

In D107684#2932603, @benshi001 wrote:

We need not add another basic_avr_tree_opt_local, since you added /avr to possible avr-libc pathes, you can test your change by specifying --sysroot %S/Inputs/basic_avr_tree/usr/lib/ .

Oh, good idea.

[benshi001]

In D107684#2932605, @mhjacobson wrote:

In D107684#2932603, @benshi001 wrote:

We need not add another basic_avr_tree_opt_local, since you added /avr to possible avr-libc pathes, you can test your change by specifying --sysroot %S/Inputs/basic_avr_tree/usr/lib/ .

Oh, good idea.

Sorry, only spefifying --sysroot %S/Inputs/basic_avr_tree/usr/lib/ does not work, since the search for avr-ld also relies on --sysroot.

So I suggest adding a new dir name avr inside Inputs/basic_avr_tree/, and also put a copy of the fake avr-libc files at Inputs/basic_avr_tree/avr.

In this way the searchs for both avr-gcc and avr-libc should work.

[mhjacobson]

Simplify.

[mhjacobson]

In D107684#2932609, @benshi001 wrote:

In D107684#2932605, @mhjacobson wrote:

In D107684#2932603, @benshi001 wrote:

We need not add another basic_avr_tree_opt_local, since you added /avr to possible avr-libc pathes, you can test your change by specifying --sysroot %S/Inputs/basic_avr_tree/usr/lib/ .

Oh, good idea.

Sorry, only spefifying --sysroot %S/Inputs/basic_avr_tree/usr/lib/ does not work, since the search for avr-ld also relies on --sysroot.

For the purpose of the test, that doesn't matter, since we're just looking for the existence of the -internal-isystem argument.

[benshi001]

@MaskRay

I think this test is OK. What is your opinion ?

[MaskRay]

clang/test/Driver/avr-toolchain.c

29

Please use the pattern in linux-cross.cpp

[mhjacobson]

clang/test/Driver/avr-toolchain.c

29

To be clear, which pattern? Placing each checked argument in its own check line? I'm happy to do that, although the other tests here don't do so...

[mhjacobson]

Rebase atop recent changes; use separate check lines and string substitution for SYSROOT.

[MaskRay]

--sysroot %S/Inputs/basic_avr_tree/usr/lib seems incorrect.

sysroot is usually a directory which contains usr/lib and lib/. somewhere/usr/lib is not usually used as a sysroot.

[mhjacobson]

In D107684#2936033, @MaskRay wrote:

--sysroot %S/Inputs/basic_avr_tree/usr/lib seems incorrect.

sysroot is usually a directory which contains usr/lib and lib/. somewhere/usr/lib is not usually used as a sysroot.

Yeah, I agree it's weird. This is basically a shortcut to avoid creating a duplicate sysroot in Inputs. Would you prefer I create the duplicate tree?

[MaskRay]

In D107684#2936034, @mhjacobson wrote:

In D107684#2936033, @MaskRay wrote:

--sysroot %S/Inputs/basic_avr_tree/usr/lib seems incorrect.

sysroot is usually a directory which contains usr/lib and lib/. somewhere/usr/lib is not usually used as a sysroot.

Yeah, I agree it's weird. This is basically a shortcut to avoid creating a duplicate sysroot in Inputs. Would you prefer I create the duplicate tree?

A duplicate tree is better. Otherwise you can use unittests/Driver/ToolChainTest.cpp

[benshi001]

It seems we need not adding this test, since a similiar test is added in https://reviews.llvm.org/rGb31199bab4865deef4e778d7a028c8ec64285654

clang/test/Driver/avr-toolchain.c

 // UNSUPPORTED: system-windows
 // A basic clang -cc1 command-line.
 
 // RUN: %clang %s -### -target avr --sysroot %S/Inputs/basic_avr_tree -resource-dir=%S/Inputs/resource_dir 2>&1 | FileCheck --check-prefix=CHECK1 %s
 // CHECK1: clang{{.*}} "-cc1" "-triple" "avr"
 // CHECK1-SAME: "-resource-dir" "[[RESOURCE:[^"]+]]"
 // CHECK1-SAME: "-isysroot" "[[SYSROOT:[^"]+/basic_avr_tree]]"
 // CHECK1-SAME: "-internal-isystem"
 // CHECK1-SAME: {{^}} "[[SYSROOT]]/usr/lib/avr/include"
 // CHECK1-NOT:  "-L
 // CHECK1:      avr-ld"
 // CHECK1-SAME: "-o" "a.out"
 // CHECK1-SAME: {{^}} "--gc-sections"
 
+/// Check the case where avr-libc lives at $SYSROOT/avr.
+// RUN: %clang %s -### -target avr --sysroot %S/Inputs/basic_avr_tree/usr/lib -resource-dir=%S/Inputs/resource_dir 2>&1 | FileCheck --check-prefix=CHECK2 %s
+// CHECK2: clang{{.*}} "-cc1" "-triple" "avr"
+// CHECK2-SAME: "-isysroot" "[[SYSROOT:[^"]+/basic_avr_tree/usr/lib]]"
+// CHECK2-SAME: "-internal-isystem"
+// CHECK2-SAME: {{^}} "[[SYSROOT]]/avr/include"
+
 // RUN: %clang %s -### -target avr 2>&1 | FileCheck -check-prefix=CC1 %s
 // CC1: clang{{.*}} "-cc1" "-triple" "avr" {{.*}} "-fno-use-init-array"
 
 // RUN: %clang %s -### -target avr --sysroot %S/Inputs/basic_avr_tree 2>&1 -nostdinc | FileCheck --check-prefix=NOSTDINC %s
 // RUN: %clang %s -### -target avr --sysroot %S/Inputs/basic_avr_tree 2>&1 -nostdlibinc | FileCheck --check-prefix=NOSTDINC %s
 // NOSTDINC-NOT: "-internal-isystem" {{".*avr/include"}}