This revision was automatically updated to reflect the committed changes. Closed by commit rG3a2df3bad07f: [Clang][test] fix tests when using external assembler. (authored by ychen).
Changed prior to commit: https://reviews.llvm.org/D80454?vs=265792&id=266088#toc Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D80454/new/ https://reviews.llvm.org/D80454 Files: clang/test/Driver/cc1-spawnprocess.c Index: clang/test/Driver/cc1-spawnprocess.c =================================================================== --- clang/test/Driver/cc1-spawnprocess.c +++ clang/test/Driver/cc1-spawnprocess.c @@ -1,18 +1,23 @@ -// 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 \ @@ -24,7 +29,7 @@ // 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
Index: clang/test/Driver/cc1-spawnprocess.c =================================================================== --- clang/test/Driver/cc1-spawnprocess.c +++ clang/test/Driver/cc1-spawnprocess.c @@ -1,18 +1,23 @@ -// 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 \ @@ -24,7 +29,7 @@ // 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
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
