[Clang][test] fix tests when using external assembler

[ychen]

Summary

The test assume using integraed-as, so make it explicit.

[ychen]

This may not be complete.

[ychen]

• update

[aganea]

Could you please attach a test to demonstrate the issue?

[ychen]

• update

[ychen]

In D80454#2051524, @aganea wrote:

Could you please attach a test to demonstrate the issue?

When a toolchain is not using integrated-as, the test would fail because using external assember would increase job counts. Most toolchains in tree use integrated-as, but we still support external assembler. So this is just making it explicit.

[aganea]

LGTM.

Are you planning on adding another patch for the change that you've sent initially? Ideally, I'd like to relax a bit that constraint in Driver.cpp, as in D74447, but that requires first to disable -disable-free to ensure we exit cleanly, at least when runing the tests (a bit like the LLD_IN_TEST env var).

[MaskRay]

In D80454#2051527, @ychen wrote:

In D80454#2051524, @aganea wrote:

Could you please attach a test to demonstrate the issue?

When a toolchain is not using integrated-as, the test would fail because using external assember would increase job counts. Most toolchains in tree use integrated-as, but we still support external assembler. So this is just making it explicit.

This point deserves a comment in the test.

@ychen What is your LLVM_DEFAULT_TARGET_TRIPLE?

[ychen]

In D80454#2051668, @MaskRay wrote:

In D80454#2051527, @ychen wrote:

In D80454#2051524, @aganea wrote:

Could you please attach a test to demonstrate the issue?

When a toolchain is not using integrated-as, the test would fail because using external assember would increase job counts. Most toolchains in tree use integrated-as, but we still support external assembler. So this is just making it explicit.

This point deserves a comment in the test.

Will do.

@ychen What is your LLVM_DEFAULT_TARGET_TRIPLE?

All I could say is that it is not a in-tree toolchain and it uses external assembler.

[ychen]

In D80454#2051637, @aganea wrote:

LGTM.

Are you planning on adding another patch for the change that you've sent initially? Ideally, I'd like to relax a bit that constraint in Driver.cpp, as in D74447, but that requires first to disable -disable-free to ensure we exit cleanly, at least when runing the tests (a bit like the LLD_IN_TEST env var).

Oh, that's not my plan. I think the motivation of D74447 makes great sense.

clang/test/Driver/cc1-spawnprocess.c

-// RUN: %clang -fintegrated-cc1 -c -### %s 2>&1 | FileCheck %s --check-prefix=YES
+// If a toolchain uses an external assembler, the test would fail because using
+// an external assember would increase job counts. Most toolchains in tree
+// use integrated assembler, but we still support external assembler.
+// So -fintegrated-as is specified explicitly when applicable.
+
+// RUN: %clang -fintegrated-cc1 -fintegrated-as -c -### %s 2>&1 | FileCheck %s --check-prefix=YES
 // RUN: %clang -fno-integrated-cc1 -c -### %s 2>&1 | FileCheck %s --check-prefix=NO
 
 // RUN: %clang -fintegrated-cc1 -fno-integrated-cc1 -c -### %s 2>&1 \
 // RUN:     | FileCheck %s --check-prefix=NO
-// RUN: %clang -fno-integrated-cc1 -fintegrated-cc1 -c -### %s 2>&1 \
+// RUN: %clang -fno-integrated-cc1 -fintegrated-cc1 -fintegrated-as -c -### %s 2>&1 \
 // RUN:     | FileCheck %s --check-prefix=YES
 
-// RUN: %clang_cl -fintegrated-cc1 -c -### -- %s 2>&1 \
+// RUN: %clang_cl -fintegrated-cc1 -fintegrated-as -c -### -- %s 2>&1 \
 // RUN:     | FileCheck %s --check-prefix=YES
 // RUN: %clang_cl -fno-integrated-cc1 -c -### -- %s 2>&1 \
 // RUN:     | FileCheck %s --check-prefix=NO
 
 // RUN: env CCC_OVERRIDE_OPTIONS=+-fintegrated-cc1 \
-// RUN:     %clang -fintegrated-cc1 -c -### %s 2>&1 \
+// RUN:     %clang -fintegrated-cc1 -fintegrated-as -c -### %s 2>&1 \
 // RUN:     | FileCheck %s --check-prefix=YES
 // RUN: env CCC_OVERRIDE_OPTIONS=+-fno-integrated-cc1 \
 // RUN:     %clang -fintegrated-cc1 -c -### %s 2>&1 \
 // RUN:     | FileCheck %s --check-prefix=NO
 
 // YES: (in-process)
 // NO-NOT: (in-process)
 
 // The following tests ensure that only one integrated-cc1 is executed.
 
 // Only one TU, one job, thus integrated-cc1 is enabled.
-// RUN: %clang -fintegrated-cc1 -c %s -### 2>&1 | FileCheck %s --check-prefix=YES
+// RUN: %clang -fintegrated-cc1 -fintegrated-as -c %s -### 2>&1 | FileCheck %s --check-prefix=YES
 
 // Only one TU, but we're linking, two jobs, thus integrated-cc1 is disabled.
 // RUN: %clang -fintegrated-cc1 %s -### 2>&1 | FileCheck %s --check-prefix=NO
 
 // RUN: echo 'int main() { return f() + g(); }' > %t1.cpp
 // RUN: echo 'int f() { return 1; }' > %t2.cpp
 // RUN: echo 'int g() { return 2; }' > %t3.cpp
 
 // Three jobs, thus integrated-cc1 is disabled.
 // RUN: %clang -fintegrated-cc1 -c %t1.cpp %t2.cpp %t3.cpp -### 2>&1 | FileCheck %s --check-prefix=NO